diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpRazorCommentsTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpRazorCommentsTest.cs
index eb626f3abe..d9aa3aa40c 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpRazorCommentsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpRazorCommentsTest.cs
@@ -8,102 +8,34 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     public class CSharpRazorCommentsTest : CsHtmlMarkupParserTestBase
     {
+        public CSharpRazorCommentsTest()
+        {
+            UseBaselineTests = true;
+        }
+
         [Fact]
         public void UnterminatedRazorComment()
         {
-            ParseDocumentTest("@*",
-                new MarkupBlock(
-                    Factory.EmptyHtml(),
-                    new CommentBlock(
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.Span(
-                            SpanKindInternal.Comment, 
-                            new HtmlSymbol(
-                                string.Empty,
-                                HtmlSymbolType.Unknown))
-                               .Accepts(AcceptedCharactersInternal.Any))),
-                RazorDiagnosticFactory.CreateParsing_RazorCommentNotTerminated(
-                    new SourceSpan(SourceLocation.Zero, contentLength: 2)));
+            ParseDocumentTest("@*");
         }
 
         [Fact]
         public void EmptyRazorComment()
         {
-            ParseDocumentTest("@**@",
-                new MarkupBlock(
-                    Factory.EmptyHtml(),
-                    new CommentBlock(
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.Span(SpanKindInternal.Comment, new HtmlSymbol(
-                            string.Empty,
-                            HtmlSymbolType.Unknown))
-                               .Accepts(AcceptedCharactersInternal.Any),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None)),
-                    Factory.EmptyHtml()));
+            ParseDocumentTest("@**@");
         }
 
         [Fact]
         public void RazorCommentInImplicitExpressionMethodCall()
         {
             ParseDocumentTest("@foo(" + Environment.NewLine
-                            + "@**@" + Environment.NewLine,
-                new MarkupBlock(
-                    Factory.EmptyHtml(),
-                    new ExpressionBlock(
-                        Factory.CodeTransition(),
-                        Factory.Code("foo(" + Environment.NewLine)
-                               .AsImplicitExpression(CSharpCodeParser.DefaultKeywords),
-                        new CommentBlock(
-                            Factory.CodeTransition(CSharpSymbolType.RazorCommentTransition)
-                                   .Accepts(AcceptedCharactersInternal.None),
-                            Factory.MetaCode("*", CSharpSymbolType.RazorCommentStar)
-                                   .Accepts(AcceptedCharactersInternal.None),
-                            Factory.Span(SpanKindInternal.Comment, new CSharpSymbol(
-                                string.Empty,
-                                CSharpSymbolType.Unknown))
-                                   .Accepts(AcceptedCharactersInternal.Any),
-                            Factory.MetaCode("*", CSharpSymbolType.RazorCommentStar)
-                                   .Accepts(AcceptedCharactersInternal.None),
-                            Factory.CodeTransition(CSharpSymbolType.RazorCommentTransition)
-                                   .Accepts(AcceptedCharactersInternal.None)),
-                        Factory.Code(Environment.NewLine)
-                               .AsImplicitExpression(CSharpCodeParser.DefaultKeywords))),
-                RazorDiagnosticFactory.CreateParsing_ExpectedCloseBracketBeforeEOF(
-                    new SourceSpan(new SourceLocation(4, 0, 4), contentLength: 1), "(", ")"));
+                            + "@**@" + Environment.NewLine);
         }
 
         [Fact]
         public void UnterminatedRazorCommentInImplicitExpressionMethodCall()
         {
-            ParseDocumentTest("@foo(@*",
-                new MarkupBlock(
-                    Factory.EmptyHtml(),
-                    new ExpressionBlock(
-                        Factory.CodeTransition(),
-                        Factory.Code("foo(")
-                               .AsImplicitExpression(CSharpCodeParser.DefaultKeywords),
-                        new CommentBlock(
-                            Factory.CodeTransition(CSharpSymbolType.RazorCommentTransition)
-                                   .Accepts(AcceptedCharactersInternal.None),
-                            Factory.MetaCode("*", CSharpSymbolType.RazorCommentStar)
-                                   .Accepts(AcceptedCharactersInternal.None),
-                            Factory.Span(SpanKindInternal.Comment, new CSharpSymbol(
-                                string.Empty,
-                                CSharpSymbolType.Unknown))
-                                    .Accepts(AcceptedCharactersInternal.Any)))),
-                RazorDiagnosticFactory.CreateParsing_RazorCommentNotTerminated(
-                    new SourceSpan(new SourceLocation(5, 0, 5), contentLength: 2)),
-                RazorDiagnosticFactory.CreateParsing_ExpectedCloseBracketBeforeEOF(
-                    new SourceSpan(new SourceLocation(4, 0, 4), contentLength: 1), "(", ")"));
+            ParseDocumentTest("@foo(@*");
         }
 
         [Fact]
@@ -112,66 +44,13 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             ParseDocumentTest("@{" + Environment.NewLine
                             + "    <text" + Environment.NewLine
                             + "    @**@" + Environment.NewLine
-                            + "}",
-                new MarkupBlock(
-                    Factory.EmptyHtml(),
-                    new StatementBlock(
-                        Factory.CodeTransition(),
-                        Factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                        Factory.Code($"{Environment.NewLine}    ")
-                            .AsStatement()
-                            .AutoCompleteWith("}"),
-                        new MarkupBlock(
-                            new MarkupTagBlock(
-                                Factory.MarkupTransition("<text").Accepts(AcceptedCharactersInternal.Any)),
-                            Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None),
-                            Factory.Markup("    ").With(SpanChunkGenerator.Null),
-                            new CommentBlock(
-                                Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                                       .Accepts(AcceptedCharactersInternal.None),
-                                Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                                       .Accepts(AcceptedCharactersInternal.None),
-                                Factory.Span(SpanKindInternal.Comment, new HtmlSymbol(
-                                    string.Empty,
-                                    HtmlSymbolType.Unknown))
-                                       .Accepts(AcceptedCharactersInternal.Any),
-                                Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                                       .Accepts(AcceptedCharactersInternal.None),
-                                Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                                       .Accepts(AcceptedCharactersInternal.None)),
-                            Factory.Markup(Environment.NewLine).With(SpanChunkGenerator.Null),
-                            Factory.Markup("}")))),
-                RazorDiagnosticFactory.CreateParsing_TextTagCannotContainAttributes(
-                    new SourceSpan(new SourceLocation(7 + Environment.NewLine.Length, 1, 5), contentLength: 4)),
-                RazorDiagnosticFactory.CreateParsing_MissingEndTag(
-                    new SourceSpan(new SourceLocation(7 + Environment.NewLine.Length, 1, 5), contentLength: 4), "text"),
-                RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
-                    new SourceSpan(new SourceLocation(1, 0, 1), contentLength: 1), Resources.BlockName_Code, "}", "{"));
+                            + "}");
         }
 
         [Fact]
         public void UnterminatedRazorCommentInVerbatimBlock()
         {
-            ParseDocumentTest("@{@*",
-                new MarkupBlock(
-                    Factory.EmptyHtml(),
-                    new StatementBlock(
-                        Factory.CodeTransition(),
-                        Factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                        Factory.EmptyCSharp()
-                            .AsStatement()
-                            .AutoCompleteWith("}"),
-                        new CommentBlock(
-                            Factory.CodeTransition(CSharpSymbolType.RazorCommentTransition)
-                                   .Accepts(AcceptedCharactersInternal.None),
-                            Factory.MetaCode("*", CSharpSymbolType.RazorCommentStar)
-                                   .Accepts(AcceptedCharactersInternal.None),
-                            Factory.Span(SpanKindInternal.Comment, new CSharpSymbol(string.Empty, CSharpSymbolType.Unknown))
-                                   .Accepts(AcceptedCharactersInternal.Any)))),
-                RazorDiagnosticFactory.CreateParsing_RazorCommentNotTerminated(
-                    new SourceSpan(new SourceLocation(2, 0, 2), contentLength: 2)),
-                RazorDiagnosticFactory.CreateParsing_ExpectedEndOfBlockBeforeEOF(
-                    new SourceSpan(new SourceLocation(1, 0, 1), contentLength: 1), Resources.BlockName_Code, "}", "{"));
+            ParseDocumentTest("@{@*");
         }
 
         [Fact]
@@ -180,28 +59,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             ParseDocumentTest(
                 "<p>" + Environment.NewLine
                 + "@**@" + Environment.NewLine
-                + "</p>",
-                new MarkupBlock(
-                    new MarkupTagBlock(
-                        Factory.Markup("<p>")),
-                    Factory.Markup(Environment.NewLine),
-                    new CommentBlock(
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.Span(SpanKindInternal.Comment, new HtmlSymbol(
-                            string.Empty,
-                            HtmlSymbolType.Unknown))
-                               .Accepts(AcceptedCharactersInternal.Any),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None)),
-                    Factory.Markup(Environment.NewLine).With(SpanChunkGenerator.Null),
-                    new MarkupTagBlock(
-                        Factory.Markup("</p>"))
-                    ));
+                + "</p>");
         }
 
         [Fact]
@@ -211,43 +69,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 "<p>" + Environment.NewLine
                 + "  @**@  " + Environment.NewLine
                 + "@**@" + Environment.NewLine
-                + "</p>",
-                new MarkupBlock(
-                    new MarkupTagBlock(
-                        Factory.Markup("<p>")),
-                    Factory.Markup(Environment.NewLine),
-                    Factory.Markup("  ").With(SpanChunkGenerator.Null),
-                    new CommentBlock(
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.Span(SpanKindInternal.Comment, new HtmlSymbol(
-                            string.Empty,
-                            HtmlSymbolType.Unknown))
-                               .Accepts(AcceptedCharactersInternal.Any),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None)),
-                    Factory.Markup("  " + Environment.NewLine).With(SpanChunkGenerator.Null),
-                    new CommentBlock(
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.Span(SpanKindInternal.Comment, new HtmlSymbol(
-                            string.Empty,
-                            HtmlSymbolType.Unknown))
-                               .Accepts(AcceptedCharactersInternal.Any),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None)),
-                    Factory.Markup(Environment.NewLine).With(SpanChunkGenerator.Null),
-                    new MarkupTagBlock(
-                        Factory.Markup("</p>"))
-                    ));
+                + "</p>");
         }
 
         [Fact]
@@ -256,43 +78,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             ParseDocumentTest(
                 "<p>" + Environment.NewLine
                 + "@**@  @**@" + Environment.NewLine
-                + "</p>",
-                new MarkupBlock(
-                    new MarkupTagBlock(
-                        Factory.Markup("<p>")),
-                    Factory.Markup(Environment.NewLine),
-                    new CommentBlock(
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.Span(SpanKindInternal.Comment, new HtmlSymbol(
-                            string.Empty,
-                            HtmlSymbolType.Unknown))
-                               .Accepts(AcceptedCharactersInternal.Any),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None)),
-                    Factory.EmptyHtml(),
-                    Factory.Markup("  ").With(SpanChunkGenerator.Null),
-                    new CommentBlock(
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.Span(SpanKindInternal.Comment, new HtmlSymbol(
-                            string.Empty,
-                            HtmlSymbolType.Unknown))
-                               .Accepts(AcceptedCharactersInternal.Any),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None)),
-                    Factory.Markup(Environment.NewLine).With(SpanChunkGenerator.Null),
-                    new MarkupTagBlock(
-                        Factory.Markup("</p>"))
-                    ));
+                + "</p>");
         }
 
         [Fact]
@@ -301,42 +87,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
             ParseDocumentTest(
                 "<p>" + Environment.NewLine
                 + "@* hello *@ content @* world *@" + Environment.NewLine
-                + "</p>",
-                new MarkupBlock(
-                    new MarkupTagBlock(
-                        Factory.Markup("<p>")),
-                    Factory.Markup(Environment.NewLine),
-                    new CommentBlock(
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.Span(SpanKindInternal.Comment, new HtmlSymbol(
-                            " hello ",
-                            HtmlSymbolType.RazorComment))
-                               .Accepts(AcceptedCharactersInternal.Any),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None)),
-                    Factory.Markup(" content "),
-                    new CommentBlock(
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.Span(SpanKindInternal.Comment, new HtmlSymbol(
-                            " world ",
-                            HtmlSymbolType.RazorComment))
-                               .Accepts(AcceptedCharactersInternal.Any),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None)),
-                    Factory.Markup(Environment.NewLine),
-                    new MarkupTagBlock(
-                        Factory.Markup("</p>"))
-                    ));
+                + "</p>");
         }
 
         [Fact]
@@ -348,43 +99,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                 + "@*" + Environment.NewLine
                 + "content" + Environment.NewLine
                 + "*@" + Environment.NewLine + Environment.NewLine
-                + "</p>",
-                new MarkupBlock(
-                    new MarkupTagBlock(
-                        Factory.Markup("<p>")),
-                    Factory.Markup(Environment.NewLine + Environment.NewLine),
-                    new CommentBlock(
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.Span(SpanKindInternal.Comment, new HtmlSymbol(
-                            " content ",
-                            HtmlSymbolType.RazorComment))
-                               .Accepts(AcceptedCharactersInternal.Any),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None)),
-                    Factory.Markup(Environment.NewLine).With(SpanChunkGenerator.Null),
-                    new CommentBlock(
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.Span(SpanKindInternal.Comment, new HtmlSymbol(
-                            Environment.NewLine + "content" + Environment.NewLine,
-                            HtmlSymbolType.RazorComment))
-                               .Accepts(AcceptedCharactersInternal.Any),
-                        Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar)
-                               .Accepts(AcceptedCharactersInternal.None),
-                        Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition)
-                               .Accepts(AcceptedCharactersInternal.None)),
-                    Factory.Markup(Environment.NewLine).With(SpanChunkGenerator.Null),
-                    Factory.Markup(Environment.NewLine),
-                    new MarkupTagBlock(
-                        Factory.Markup("</p>"))
-                    ));
+                + "</p>");
         }
     }
 }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpReservedWordsTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpReservedWordsTest.cs
index 7248a798bc..57ac9757fc 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpReservedWordsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpReservedWordsTest.cs
@@ -11,35 +11,17 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             UseBaselineTests = true;
         }
-
-        [Theory]
-        [InlineData("namespace")]
-        [InlineData("class")]
-        public void ReservedWords(string word)
+        
+        [Fact]
+        public void ReservedWord()
         {
-            ParseBlockTest(word,
-                           new DirectiveBlock(
-                               Factory.MetaCode(word).Accepts(AcceptedCharactersInternal.None)
-                               ),
-                           RazorDiagnosticFactory.CreateParsing_ReservedWord(
-                               new SourceSpan(SourceLocation.Zero, word.Length), word));
+            ParseBlockTest("namespace");
         }
 
-        [Theory]
-        [InlineData("Namespace")]
-        [InlineData("Class")]
-        [InlineData("NAMESPACE")]
-        [InlineData("CLASS")]
-        [InlineData("nameSpace")]
-        [InlineData("NameSpace")]
-        private void ReservedWordsAreCaseSensitive(string word)
+        [Fact]
+        private void ReservedWordIsCaseSensitive()
         {
-            ParseBlockTest(word,
-                           new ExpressionBlock(
-                               Factory.Code(word)
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)
-                               ));
+            ParseBlockTest("NameSpace");
         }
     }
 }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpToMarkupSwitchTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpToMarkupSwitchTest.cs
index 1d96a65590..adf71262af 100644
--- a/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpToMarkupSwitchTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/CSharpToMarkupSwitchTest.cs
@@ -8,40 +8,21 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     public class CSharpToMarkupSwitchTest : CsHtmlCodeParserTestBase
     {
+        public CSharpToMarkupSwitchTest()
+        {
+            UseBaselineTests = true;
+        }
+
         [Fact]
         public void SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated()
         {
-            ParseBlockTest("{ List< }",
-                new StatementBlock(
-                    Factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                    Factory.Code(" List< ")
-                        .AsStatement()
-                        .AutoCompleteWith(autoCompleteString: null),
-                    Factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)));
+            ParseBlockTest("{ List< }");
         }
 
         [Fact]
         public void ParseBlockGivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode()
         {
-            ParseBlockTest("Foo(    @<p>Foo</p>    )",
-                           new ExpressionBlock(
-                               Factory.Code("Foo(    ")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.Any),
-                               new TemplateBlock(
-                                   new MarkupBlock(
-                                       Factory.MarkupTransition(),
-                                       new MarkupTagBlock(
-                                            Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                       Factory.Markup("Foo"),
-                                       new MarkupTagBlock(
-                                           Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None))
-                                       )
-                                   ),
-                               Factory.Code("    )")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)
-                               ), designTime: true);
+            ParseBlockTest("Foo(    @<p>Foo</p>    )", designTime: true);
         }
 
         [Fact]
@@ -49,21 +30,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             ParseBlockTest("Foo(    " + Environment.NewLine
                          + "@:<p>Foo</p>    " + Environment.NewLine
-                         + ")",
-                           new ExpressionBlock(
-                               Factory.Code("Foo(    " + Environment.NewLine).AsImplicitExpression(CSharpCodeParser.DefaultKeywords),
-                               new TemplateBlock(
-                                   new MarkupBlock(
-                                       Factory.MarkupTransition(),
-                                       Factory.MetaMarkup(":", HtmlSymbolType.Colon),
-                                       Factory.Markup("<p>Foo</p>    " + Environment.NewLine)
-                                           .With(new SpanEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString, AcceptedCharactersInternal.None))
-                                       )
-                                   ),
-                               Factory.Code(")")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)
-                               ), designTime: true);
+                         + ")", designTime: true);
         }
 
         [Fact]
@@ -71,22 +38,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             ParseBlockTest("{" + Environment.NewLine
                          + "    <p>Foo</p>    " + Environment.NewLine
-                         + "}",
-                           new StatementBlock(
-                               Factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                               Factory.Code(Environment.NewLine + "    ")
-                                   .AsStatement()
-                                   .AutoCompleteWith(autoCompleteString: null),
-                               new MarkupBlock(
-                                        new MarkupTagBlock(
-                                            Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                       Factory.Markup("Foo"),
-                                       new MarkupTagBlock(
-                                           Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None))
-                                   ),
-                               Factory.Code("    " + Environment.NewLine).AsStatement(),
-                               Factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)
-                               ), designTime: true);
+                         + "}", designTime: true);
         }
 
         [Fact]
@@ -94,25 +46,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             ParseBlockTest("{" + Environment.NewLine
                          + "    @<p>Foo</p>    " + Environment.NewLine
-                         + "}",
-                           new StatementBlock(
-                               Factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                               Factory.Code(Environment.NewLine + "    ")
-                                   .AsStatement()
-                                   .AutoCompleteWith(autoCompleteString: null),
-                               new MarkupBlock(
-                                   Factory.MarkupTransition(),
-                                        new MarkupTagBlock(
-                                            Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                       Factory.Markup("Foo"),
-                                       new MarkupTagBlock(
-                                           Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None))
-                                   ),
-                               Factory.Code("    " + Environment.NewLine).AsStatement(),
-                               Factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)
-                               ), true,
-                           RazorDiagnosticFactory.CreateParsing_AtInCodeMustBeFollowedByColonParenOrIdentifierStart(
-                               new SourceSpan(new SourceLocation(5 + Environment.NewLine.Length, 1, 4), contentLength: 1)));
+                         + "}", designTime: true);
         }
 
         [Fact]
@@ -120,21 +54,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             ParseBlockTest("{" + Environment.NewLine
                          + "    @:<p>Foo</p>    " + Environment.NewLine
-                         + "}",
-                           new StatementBlock(
-                               Factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                               Factory.Code(Environment.NewLine + "    ")
-                                   .AsStatement()
-                                   .AutoCompleteWith(autoCompleteString: null),
-                               new MarkupBlock(
-                                   Factory.MarkupTransition(),
-                                   Factory.MetaMarkup(":", HtmlSymbolType.Colon),
-                                   Factory.Markup("<p>Foo</p>    " + Environment.NewLine)
-                                       .With(new SpanEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString, AcceptedCharactersInternal.None))
-                                   ),
-                               Factory.EmptyCSharp().AsStatement(),
-                               Factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)
-                               ), designTime: true);
+                         + "}", designTime: true);
         }
 
         [Fact]
@@ -142,32 +62,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             ParseBlockTest("Repeat(10," + Environment.NewLine
                          + "    @: @{}" + Environment.NewLine
-                         + ")",
-                           new ExpressionBlock(
-                               Factory.Code($"Repeat(10,{Environment.NewLine}    ")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords),
-                               new TemplateBlock(
-                                   new MarkupBlock(
-                                       Factory.MarkupTransition(),
-                                       Factory.MetaMarkup(":", HtmlSymbolType.Colon),
-                                       Factory.Markup(" ")
-                                           .With(new SpanEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString)),
-                                       new StatementBlock(
-                                           Factory.CodeTransition(),
-                                           Factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                                           Factory.EmptyCSharp()
-                                               .AsStatement()
-                                               .AutoCompleteWith(autoCompleteString: null),
-                                           Factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)
-                                           ),
-                                       Factory.Markup(Environment.NewLine)
-                                           .Accepts(AcceptedCharactersInternal.None)
-                                   )
-                               ),
-                               Factory.Code(")")
-                                   .AsImplicitExpression(CSharpCodeParser.DefaultKeywords)
-                                   .Accepts(AcceptedCharactersInternal.NonWhiteSpace)
-                               ));
+                         + ")");
         }
 
         [Fact]
@@ -180,35 +75,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                          + "<br/>" + Environment.NewLine
                          + "<a>Foo</a>" + Environment.NewLine
                          + "@:Bar" + Environment.NewLine
-                         + "}",
-                           new StatementBlock(
-                               Factory.Code(string.Format("foreach(var file in files){{{0}{0}{0}", Environment.NewLine)).AsStatement(),
-                               new MarkupBlock(
-                                   Factory.MarkupTransition(),
-                                   Factory.MetaMarkup(":", HtmlSymbolType.Colon),
-                                   Factory.Markup("Baz" + Environment.NewLine)
-                                       .With(new SpanEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString, AcceptedCharactersInternal.None))
-                                   ),
-                               new MarkupBlock(
-                                   new MarkupTagBlock(
-                                        Factory.Markup("<br/>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               new MarkupBlock(
-                                   new MarkupTagBlock(
-                                       Factory.Markup("<a>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup("Foo"),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("</a>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None)),
-                               new MarkupBlock(
-                                   Factory.MarkupTransition(),
-                                   Factory.MetaMarkup(":", HtmlSymbolType.Colon),
-                                   Factory.Markup("Bar" + Environment.NewLine)
-                                       .With(new SpanEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString, AcceptedCharactersInternal.None))
-                                   ),
-                               Factory.Code("}").AsStatement().Accepts(AcceptedCharactersInternal.None)
-                               ));
+                         + "}");
         }
 
         [Fact]
@@ -222,115 +89,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                          + "    </p>" + Environment.NewLine
                          + "    @:Hello!" + Environment.NewLine
                          + "    var biz = boz;" + Environment.NewLine
-                         + "}",
-                           new StatementBlock(
-                               Factory.Code(
-                                   $"if(foo) {{{Environment.NewLine}    var foo = \"After this statement there are " +
-                                   "10 spaces\";          " + Environment.NewLine).AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup("    "),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup($"{Environment.NewLine}        Foo{Environment.NewLine}"),
-                                   new ExpressionBlock(
-                                       Factory.Code("        ").AsStatement(),
-                                       Factory.CodeTransition(),
-                                       Factory.Code("bar").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)
-                                       ),
-                                   Factory.Markup(Environment.NewLine + "    "),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               new MarkupBlock(
-                                   Factory.Markup("    "),
-                                   Factory.MarkupTransition(),
-                                   Factory.MetaMarkup(":", HtmlSymbolType.Colon),
-                                   Factory.Markup("Hello!" + Environment.NewLine).With(new SpanEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString, AcceptedCharactersInternal.None))
-                                   ),
-                               Factory.Code($"    var biz = boz;{Environment.NewLine}}}").AsStatement()));
+                         + "}");
         }
 
         [Fact]
         public void ParseBlockAllowsMarkupInIfBodyWithBraces()
         {
-            ParseBlockTest("if(foo) { <p>Bar</p> } else if(bar) { <p>Baz</p> } else { <p>Boz</p> }",
-                           new StatementBlock(
-                               Factory.Code("if(foo) {").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup(" "),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup("Bar"),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup(" ").Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code("} else if(bar) {").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup(" "),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup("Baz"),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup(" ").Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code("} else {").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup(" "),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup("Boz"),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup(" ").Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code("}").AsStatement().Accepts(AcceptedCharactersInternal.None)
-                               ));
+            ParseBlockTest("if(foo) { <p>Bar</p> } else if(bar) { <p>Baz</p> } else { <p>Boz</p> }");
         }
 
         [Fact]
         public void ParseBlockAllowsMarkupInIfBodyWithBracesWithinCodeBlock()
         {
-            ParseBlockTest("{ if(foo) { <p>Bar</p> } else if(bar) { <p>Baz</p> } else { <p>Boz</p> } }",
-                           new StatementBlock(
-                               Factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                               Factory.Code(" if(foo) {")
-                                   .AsStatement()
-                                   .AutoCompleteWith(autoCompleteString: null),
-                               new MarkupBlock(
-                                   Factory.Markup(" "),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup("Bar"),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup(" ").Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code("} else if(bar) {").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup(" "),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup("Baz"),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup(" ").Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code("} else {").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup(" "),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup("Boz"),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup(" ").Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code("} ").AsStatement(),
-                               Factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)
-                               ));
+            ParseBlockTest("{ if(foo) { <p>Bar</p> } else if(bar) { <p>Baz</p> } else { <p>Boz</p> } }");
         }
 
         [Fact]
@@ -351,60 +122,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                          + "        }" + Environment.NewLine
                          + "    default:" + Environment.NewLine
                          + "        <p>Biz</p>" + Environment.NewLine
-                         + "}",
-                           new StatementBlock(
-                               Factory.Code($"switch(foo) {{{Environment.NewLine}    case 0:{Environment.NewLine}").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup("        "),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup("Foo"),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code($"        break;{Environment.NewLine}    case 1:{Environment.NewLine}").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup("        "),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup("Bar"),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code(
-                                $"        return;{Environment.NewLine}    case 2:{Environment.NewLine}" +
-                                "        {" + Environment.NewLine).AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup("            "),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup("Baz"),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               new MarkupBlock(
-                                   Factory.Markup("            "),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup("Boz"),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code($"        }}{Environment.NewLine}    default:{Environment.NewLine}").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup("        "),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup("Biz"),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code("}").AsStatement().Accepts(AcceptedCharactersInternal.None)));
+                         + "}");
         }
 
         [Fact]
@@ -425,105 +143,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                          + "        }" + Environment.NewLine
                          + "    default:" + Environment.NewLine
                          + "        <p>Biz</p>" + Environment.NewLine
-                         + "} }",
-                           new StatementBlock(
-                               Factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                               Factory.Code($" switch(foo) {{{Environment.NewLine}    case 0:{Environment.NewLine}")
-                                   .AsStatement()
-                                   .AutoCompleteWith(autoCompleteString: null),
-                               new MarkupBlock(
-                                   Factory.Markup("        "),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup("Foo"),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code($"        break;{Environment.NewLine}    case 1:{Environment.NewLine}").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup("        "),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup("Bar"),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code(
-                                $"        return;{Environment.NewLine}    case 2:{Environment.NewLine}" +
-                                "        {" + Environment.NewLine).AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup("            "),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup("Baz"),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               new MarkupBlock(
-                                   Factory.Markup("            "),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup("Boz"),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code($"        }}{Environment.NewLine}    default:{Environment.NewLine}").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup("        "),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup("Biz"),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code("} ").AsStatement(),
-                               Factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)));
+                         + "} }");
         }
 
         [Fact]
         public void ParseBlockParsesMarkupStatementOnOpenAngleBracket()
         {
-            ParseBlockTest("for(int i = 0; i < 10; i++) { <p>Foo</p> }",
-                           new StatementBlock(
-                               Factory.Code("for(int i = 0; i < 10; i++) {").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup(" "),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup("Foo"),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup(" ").Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code("}").AsStatement().Accepts(AcceptedCharactersInternal.None)
-                               ));
+            ParseBlockTest("for(int i = 0; i < 10; i++) { <p>Foo</p> }");
         }
 
         [Fact]
         public void ParseBlockParsesMarkupStatementOnOpenAngleBracketInCodeBlock()
         {
-            ParseBlockTest("{ for(int i = 0; i < 10; i++) { <p>Foo</p> } }",
-                           new StatementBlock(
-                               Factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                               Factory.Code(" for(int i = 0; i < 10; i++) {")
-                                   .AsStatement()
-                                   .AutoCompleteWith(autoCompleteString: null),
-                               new MarkupBlock(
-                                    Factory.Markup(" "),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup("Foo"),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup(" ").Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code("} ").AsStatement(),
-                               Factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)));
+            ParseBlockTest("{ for(int i = 0; i < 10; i++) { <p>Foo</p> } }");
         }
 
         [Fact]
@@ -531,17 +163,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             // Arrange
             ParseBlockTest("if(foo) { @:Bar" + Environment.NewLine
-                         + "} zoop",
-                           new StatementBlock(
-                               Factory.Code("if(foo) {").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup(" "),
-                                   Factory.MarkupTransition(),
-                                   Factory.MetaMarkup(":", HtmlSymbolType.Colon),
-                                   Factory.Markup("Bar" + Environment.NewLine)
-                                    .With(new SpanEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString, AcceptedCharactersInternal.None))
-                                   ),
-                               Factory.Code("}").AsStatement()));
+                         + "} zoop");
         }
 
         [Fact]
@@ -549,17 +171,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             // Arrange
             ParseBlockTest("if(foo) { @::Sometext" + Environment.NewLine
-                         + "}",
-                           new StatementBlock(
-                               Factory.Code("if(foo) {").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup(" "),
-                                   Factory.MarkupTransition(),
-                                   Factory.MetaMarkup(":", HtmlSymbolType.Colon),
-                                   Factory.Markup(":Sometext" + Environment.NewLine)
-                                    .With(new SpanEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString, AcceptedCharactersInternal.None))
-                                   ),
-                               Factory.Code("}").AsStatement()));
+                         + "}");
         }
 
 
@@ -568,17 +180,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             // Arrange
             ParseBlockTest("if(foo) { @:::Sometext" + Environment.NewLine
-                         + "}",
-                           new StatementBlock(
-                               Factory.Code("if(foo) {").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup(" "),
-                                   Factory.MarkupTransition(),
-                                   Factory.MetaMarkup(":", HtmlSymbolType.Colon),
-                                   Factory.Markup("::Sometext" + Environment.NewLine)
-                                    .With(new SpanEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString, AcceptedCharactersInternal.None))
-                                   ),
-                               Factory.Code("}").AsStatement()));
+                         + "}");
         }
 
         [Fact]
@@ -586,55 +188,19 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
         {
             // Arrange
             ParseBlockTest("{ if(foo) { @:Bar" + Environment.NewLine
-                         + "} } zoop",
-                           new StatementBlock(
-                               Factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                               Factory.Code(" if(foo) {")
-                                   .AsStatement()
-                                   .AutoCompleteWith(autoCompleteString: null),
-                               new MarkupBlock(
-                                   Factory.Markup(" "),
-                                   Factory.MarkupTransition(),
-                                   Factory.MetaMarkup(":", HtmlSymbolType.Colon),
-                                   Factory.Markup("Bar" + Environment.NewLine).Accepts(AcceptedCharactersInternal.None)
-                                       .With(new SpanEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString, AcceptedCharactersInternal.None))
-                                   ),
-                               Factory.Code("} ").AsStatement(),
-                               Factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)));
+                         + "} } zoop");
         }
 
         [Fact]
         public void ParseBlockCorrectlyReturnsFromMarkupBlockWithPseudoTag()
         {
-            ParseBlockTest("if (i > 0) { <text>;</text> }",
-                           new StatementBlock(
-                               Factory.Code("if (i > 0) { ").AsStatement(),
-                               new MarkupBlock(
-                                   new MarkupTagBlock(
-                                        Factory.MarkupTransition("<text>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(";").Accepts(AcceptedCharactersInternal.None),
-                                   new MarkupTagBlock(
-                                        Factory.MarkupTransition("</text>").Accepts(AcceptedCharactersInternal.None))),
-                               Factory.Code(" }").AsStatement()));
+            ParseBlockTest("if (i > 0) { <text>;</text> }");
         }
 
         [Fact]
         public void ParseBlockCorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock()
         {
-            ParseBlockTest("{ if (i > 0) { <text>;</text> } }",
-                           new StatementBlock(
-                               Factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                               Factory.Code(" if (i > 0) { ")
-                                   .AsStatement()
-                                   .AutoCompleteWith(autoCompleteString: null),
-                               new MarkupBlock(
-                                   new MarkupTagBlock(
-                                        Factory.MarkupTransition("<text>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup(";").Accepts(AcceptedCharactersInternal.None),
-                                   new MarkupTagBlock(
-                                        Factory.MarkupTransition("</text>").Accepts(AcceptedCharactersInternal.None))),
-                               Factory.Code(" } ").AsStatement(),
-                               Factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)));
+            ParseBlockTest("{ if (i > 0) { <text>;</text> } }");
         }
 
         [Fact]
@@ -650,42 +216,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
                          + "    if(!false) {" + Environment.NewLine
                          + "        <p>A real tag!</p>" + Environment.NewLine
                          + "    }" + Environment.NewLine
-                         + "}",
-                           new StatementBlock(
-                               Factory.MetaCode("{").Accepts(AcceptedCharactersInternal.None),
-                               Factory.Code($"{Environment.NewLine}    if(true) {{{Environment.NewLine}")
-                                   .AsStatement()
-                                   .AutoCompleteWith(autoCompleteString: null),
-                               new MarkupBlock(
-                                   Factory.Markup("        "),
-                                   Factory.MarkupTransition(),
-                                   Factory.MetaMarkup(":", HtmlSymbolType.Colon),
-                                   Factory.Markup("Single Line Markup" + Environment.NewLine)
-                                    .With(new SpanEditHandler(CSharpLanguageCharacteristics.Instance.TokenizeString, AcceptedCharactersInternal.None))
-                                   ),
-                               Factory.Code($"    }}{Environment.NewLine}    foreach (var p in Enumerable.Range(1, 10)) {{{Environment.NewLine}        ").AsStatement(),
-                               new MarkupBlock(
-                                   new MarkupTagBlock(
-                                        Factory.MarkupTransition("<text>").Accepts(AcceptedCharactersInternal.None)),
-                                   Factory.Markup("The number is ").Accepts(AcceptedCharactersInternal.None),
-                                   new ExpressionBlock(
-                                       Factory.CodeTransition(),
-                                       Factory.Code("p").AsImplicitExpression(CSharpCodeParser.DefaultKeywords).Accepts(AcceptedCharactersInternal.NonWhiteSpace)
-                                       ),
-                                   new MarkupTagBlock(
-                                        Factory.MarkupTransition("</text>").Accepts(AcceptedCharactersInternal.None))),
-                               Factory.Code($"{Environment.NewLine}    }}{Environment.NewLine}    if(!false) {{{Environment.NewLine}").AsStatement(),
-                               new MarkupBlock(
-                                   Factory.Markup("        "),
-                                   new MarkupTagBlock(
-                                       Factory.Markup("<p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup("A real tag!"),
-                                    new MarkupTagBlock(
-                                        Factory.Markup("</p>").Accepts(AcceptedCharactersInternal.None)),
-                                    Factory.Markup(Environment.NewLine).Accepts(AcceptedCharactersInternal.None)
-                                   ),
-                               Factory.Code("    }" + Environment.NewLine).AsStatement(),
-                               Factory.MetaCode("}").Accepts(AcceptedCharactersInternal.None)));
+                         + "}");
         }
     }
 }
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.syntaxtree.txt
new file mode 100644
index 0000000000..87e94e8487
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/EmptyRazorComment.syntaxtree.txt
@@ -0,0 +1,16 @@
+Markup block - Gen<None> - 4 - (0:0,0)
+    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1
+        HtmlSymbolType.Unknown;[];
+    Comment block - Gen<RazorComment> - 4 - (0:0,0)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1
+            HtmlSymbolType.Unknown;[];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (2:0,2) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (3:0,3) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (4:0,4) - Symbols:1
+        HtmlSymbolType.Unknown;[];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.syntaxtree.txt
new file mode 100644
index 0000000000..fb0fc05609
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentInMarkup.syntaxtree.txt
@@ -0,0 +1,43 @@
+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) - Symbols:3
+            HtmlSymbolType.OpenAngle;[<];
+            HtmlSymbolType.Text;[p];
+            HtmlSymbolType.CloseAngle;[>];
+    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Symbols:1
+        HtmlSymbolType.NewLine;[LF];
+    Markup span - Gen<None> - [  ] - SpanEditHandler;Accepts:Any - (5:1,0) - Symbols:1
+        HtmlSymbolType.WhiteSpace;[  ];
+    Comment block - Gen<RazorComment> - 4 - (7:1,2)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (7:1,2) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (8:1,3) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (9:1,4) - Symbols:1
+            HtmlSymbolType.Unknown;[];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (9:1,4) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:1,5) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+    Markup span - Gen<None> - [  LF] - SpanEditHandler;Accepts:Any - (11:1,6) - Symbols:2
+        HtmlSymbolType.WhiteSpace;[  ];
+        HtmlSymbolType.NewLine;[LF];
+    Comment block - Gen<RazorComment> - 4 - (15:2,0)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:2,0) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (16:2,1) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (17:2,2) - Symbols:1
+            HtmlSymbolType.Unknown;[];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (17:2,2) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (18:2,3) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (19:2,4) - Symbols:1
+        HtmlSymbolType.NewLine;[LF];
+    Tag block - Gen<None> - 4 - (21:3,0)
+        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (21:3,0) - Symbols:4
+            HtmlSymbolType.OpenAngle;[<];
+            HtmlSymbolType.ForwardSlash;[/];
+            HtmlSymbolType.Text;[p];
+            HtmlSymbolType.CloseAngle;[>];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.syntaxtree.txt
new file mode 100644
index 0000000000..8e60c9043c
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/MultipleRazorCommentsInSameLineInMarkup.syntaxtree.txt
@@ -0,0 +1,42 @@
+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) - Symbols:3
+            HtmlSymbolType.OpenAngle;[<];
+            HtmlSymbolType.Text;[p];
+            HtmlSymbolType.CloseAngle;[>];
+    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Symbols:1
+        HtmlSymbolType.NewLine;[LF];
+    Comment block - Gen<RazorComment> - 4 - (5:1,0)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (5:1,0) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (6:1,1) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (7:1,2) - Symbols:1
+            HtmlSymbolType.Unknown;[];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (7:1,2) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (8:1,3) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (9:1,4) - Symbols:1
+        HtmlSymbolType.Unknown;[];
+    Markup span - Gen<None> - [  ] - SpanEditHandler;Accepts:Any - (9:1,4) - Symbols:1
+        HtmlSymbolType.WhiteSpace;[  ];
+    Comment block - Gen<RazorComment> - 4 - (11:1,6)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (11:1,6) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (12:1,7) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (13:1,8) - Symbols:1
+            HtmlSymbolType.Unknown;[];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (13:1,8) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (14:1,9) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (15:1,10) - Symbols:1
+        HtmlSymbolType.NewLine;[LF];
+    Tag block - Gen<None> - 4 - (17:2,0)
+        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (17:2,0) - Symbols:4
+            HtmlSymbolType.OpenAngle;[<];
+            HtmlSymbolType.ForwardSlash;[/];
+            HtmlSymbolType.Text;[p];
+            HtmlSymbolType.CloseAngle;[>];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.diagnostics.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.diagnostics.txt
new file mode 100644
index 0000000000..ade6c85b25
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.diagnostics.txt
@@ -0,0 +1 @@
+(1,5): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.syntaxtree.txt
new file mode 100644
index 0000000000..8e31004d17
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInImplicitExpressionMethodCall.syntaxtree.txt
@@ -0,0 +1,23 @@
+Markup block - Gen<None> - 13 - (0:0,0)
+    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1
+        HtmlSymbolType.Unknown;[];
+    Expression block - Gen<Expr> - 13 - (0:0,0)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+            CSharpSymbolType.Transition;[@];
+        Code span - Gen<Expr> - [foo(LF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:3
+            CSharpSymbolType.Identifier;[foo];
+            CSharpSymbolType.LeftParenthesis;[(];
+            CSharpSymbolType.NewLine;[LF];
+        Comment block - Gen<RazorComment> - 4 - (7:1,0)
+            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (7:1,0) - Symbols:1
+                CSharpSymbolType.RazorCommentTransition;[@];
+            MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (8:1,1) - Symbols:1
+                CSharpSymbolType.RazorCommentStar;[*];
+            Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (9:1,2) - Symbols:1
+                CSharpSymbolType.Unknown;[];
+            MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (9:1,2) - Symbols:1
+                CSharpSymbolType.RazorCommentStar;[*];
+            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:1,3) - Symbols:1
+                CSharpSymbolType.RazorCommentTransition;[@];
+        Code span - Gen<Expr> - [LF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (11:1,4) - Symbols:1
+            CSharpSymbolType.NewLine;[LF];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.syntaxtree.txt
new file mode 100644
index 0000000000..8a702cad41
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInMarkup.syntaxtree.txt
@@ -0,0 +1,27 @@
+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) - Symbols:3
+            HtmlSymbolType.OpenAngle;[<];
+            HtmlSymbolType.Text;[p];
+            HtmlSymbolType.CloseAngle;[>];
+    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Symbols:1
+        HtmlSymbolType.NewLine;[LF];
+    Comment block - Gen<RazorComment> - 4 - (5:1,0)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (5:1,0) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (6:1,1) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (7:1,2) - Symbols:1
+            HtmlSymbolType.Unknown;[];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (7:1,2) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (8:1,3) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (9:1,4) - Symbols:1
+        HtmlSymbolType.NewLine;[LF];
+    Tag block - Gen<None> - 4 - (11:2,0)
+        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (11:2,0) - Symbols:4
+            HtmlSymbolType.OpenAngle;[<];
+            HtmlSymbolType.ForwardSlash;[/];
+            HtmlSymbolType.Text;[p];
+            HtmlSymbolType.CloseAngle;[>];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.diagnostics.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.diagnostics.txt
new file mode 100644
index 0000000000..1567f665b6
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.diagnostics.txt
@@ -0,0 +1,3 @@
+(2,6): Error RZ1023: "<text>" and "</text>" tags cannot contain attributes.
+(2,6): Error RZ1025: The "text" element was not closed.  All elements must be either self-closing or have a matching end tag.
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.syntaxtree.txt
new file mode 100644
index 0000000000..ca37c88848
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentInVerbatimBlock.syntaxtree.txt
@@ -0,0 +1,35 @@
+Markup block - Gen<None> - 26 - (0:0,0)
+    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1
+        HtmlSymbolType.Unknown;[];
+    Statement block - Gen<None> - 26 - (0:0,0)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+            CSharpSymbolType.Transition;[@];
+        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1
+            CSharpSymbolType.LeftBrace;[{];
+        Code span - Gen<Stmt> - [LF    ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Symbols:2
+            CSharpSymbolType.NewLine;[LF];
+            CSharpSymbolType.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) - Symbols:2
+                    HtmlSymbolType.OpenAngle;[<];
+                    HtmlSymbolType.Text;[text];
+            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (13:1,9) - Symbols:1
+                HtmlSymbolType.NewLine;[LF];
+            Markup span - Gen<None> - [    ] - SpanEditHandler;Accepts:Any - (15:2,0) - Symbols:1
+                HtmlSymbolType.WhiteSpace;[    ];
+            Comment block - Gen<RazorComment> - 4 - (19:2,4)
+                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (19:2,4) - Symbols:1
+                    HtmlSymbolType.RazorCommentTransition;[@];
+                MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (20:2,5) - Symbols:1
+                    HtmlSymbolType.RazorCommentStar;[*];
+                Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (21:2,6) - Symbols:1
+                    HtmlSymbolType.Unknown;[];
+                MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (21:2,6) - Symbols:1
+                    HtmlSymbolType.RazorCommentStar;[*];
+                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (22:2,7) - Symbols:1
+                    HtmlSymbolType.RazorCommentTransition;[@];
+            Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (23:2,8) - Symbols:1
+                HtmlSymbolType.NewLine;[LF];
+            Markup span - Gen<Markup> - [}] - SpanEditHandler;Accepts:Any - (25:3,0) - Symbols:1
+                HtmlSymbolType.Text;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.syntaxtree.txt
new file mode 100644
index 0000000000..68282435f9
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentWithExtraNewLineInMarkup.syntaxtree.txt
@@ -0,0 +1,43 @@
+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) - Symbols:3
+            HtmlSymbolType.OpenAngle;[<];
+            HtmlSymbolType.Text;[p];
+            HtmlSymbolType.CloseAngle;[>];
+    Markup span - Gen<Markup> - [LFLF] - SpanEditHandler;Accepts:Any - (3:0,3) - Symbols:2
+        HtmlSymbolType.NewLine;[LF];
+        HtmlSymbolType.NewLine;[LF];
+    Comment block - Gen<RazorComment> - 13 - (7:2,0)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (7:2,0) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (8:2,1) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Comment span - Gen<None> - [ content ] - SpanEditHandler;Accepts:Any - (9:2,2) - Symbols:1
+            HtmlSymbolType.RazorComment;[ content ];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (18:2,11) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (19:2,12) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (20:2,13) - Symbols:1
+        HtmlSymbolType.NewLine;[LF];
+    Comment block - Gen<RazorComment> - 15 - (22:3,0)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (22:3,0) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (23:3,1) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Comment span - Gen<None> - [LFcontentLF] - SpanEditHandler;Accepts:Any - (24:3,2) - Symbols:1
+            HtmlSymbolType.RazorComment;[LFcontentLF];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (35:5,0) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (36:5,1) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+    Markup span - Gen<None> - [LF] - SpanEditHandler;Accepts:Any - (37:5,2) - Symbols:1
+        HtmlSymbolType.NewLine;[LF];
+    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (39:6,0) - Symbols:1
+        HtmlSymbolType.NewLine;[LF];
+    Tag block - Gen<None> - 4 - (41:7,0)
+        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (41:7,0) - Symbols:4
+            HtmlSymbolType.OpenAngle;[<];
+            HtmlSymbolType.ForwardSlash;[/];
+            HtmlSymbolType.Text;[p];
+            HtmlSymbolType.CloseAngle;[>];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.syntaxtree.txt
new file mode 100644
index 0000000000..3dd0ba4972
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/RazorCommentsSurroundingMarkup.syntaxtree.txt
@@ -0,0 +1,42 @@
+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) - Symbols:3
+            HtmlSymbolType.OpenAngle;[<];
+            HtmlSymbolType.Text;[p];
+            HtmlSymbolType.CloseAngle;[>];
+    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (3:0,3) - Symbols:1
+        HtmlSymbolType.NewLine;[LF];
+    Comment block - Gen<RazorComment> - 11 - (5:1,0)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (5:1,0) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (6:1,1) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Comment span - Gen<None> - [ hello ] - SpanEditHandler;Accepts:Any - (7:1,2) - Symbols:1
+            HtmlSymbolType.RazorComment;[ hello ];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (14:1,9) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (15:1,10) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+    Markup span - Gen<Markup> - [ content ] - SpanEditHandler;Accepts:Any - (16:1,11) - Symbols:3
+        HtmlSymbolType.WhiteSpace;[ ];
+        HtmlSymbolType.Text;[content];
+        HtmlSymbolType.WhiteSpace;[ ];
+    Comment block - Gen<RazorComment> - 11 - (25:1,20)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (25:1,20) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (26:1,21) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Comment span - Gen<None> - [ world ] - SpanEditHandler;Accepts:Any - (27:1,22) - Symbols:1
+            HtmlSymbolType.RazorComment;[ world ];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (34:1,29) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (35:1,30) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+    Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:Any - (36:1,31) - Symbols:1
+        HtmlSymbolType.NewLine;[LF];
+    Tag block - Gen<None> - 4 - (38:2,0)
+        Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:Any - (38:2,0) - Symbols:4
+            HtmlSymbolType.OpenAngle;[<];
+            HtmlSymbolType.ForwardSlash;[/];
+            HtmlSymbolType.Text;[p];
+            HtmlSymbolType.CloseAngle;[>];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.diagnostics.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.diagnostics.txt
new file mode 100644
index 0000000000..4f3108141d
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.diagnostics.txt
@@ -0,0 +1 @@
+(1,1): Error RZ1028: End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.syntaxtree.txt
new file mode 100644
index 0000000000..b2de99c70f
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorComment.syntaxtree.txt
@@ -0,0 +1,10 @@
+Markup block - Gen<None> - 2 - (0:0,0)
+    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1
+        HtmlSymbolType.Unknown;[];
+    Comment block - Gen<RazorComment> - 2 - (0:0,0)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+            HtmlSymbolType.RazorCommentTransition;[@];
+        MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1
+            HtmlSymbolType.RazorCommentStar;[*];
+        Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (2:0,2) - Symbols:1
+            HtmlSymbolType.Unknown;[];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.diagnostics.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.diagnostics.txt
new file mode 100644
index 0000000000..b65a64c148
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.diagnostics.txt
@@ -0,0 +1,2 @@
+(1,6): Error RZ1028: End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.
+(1,5): Error RZ1027: An opening "(" is missing the corresponding closing ")".
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.syntaxtree.txt
new file mode 100644
index 0000000000..8a9ca61d07
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInImplicitExpressionMethodCall.syntaxtree.txt
@@ -0,0 +1,16 @@
+Markup block - Gen<None> - 7 - (0:0,0)
+    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1
+        HtmlSymbolType.Unknown;[];
+    Expression block - Gen<Expr> - 7 - (0:0,0)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+            CSharpSymbolType.Transition;[@];
+        Code span - Gen<Expr> - [foo(] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (1:0,1) - Symbols:2
+            CSharpSymbolType.Identifier;[foo];
+            CSharpSymbolType.LeftParenthesis;[(];
+        Comment block - Gen<RazorComment> - 2 - (5:0,5)
+            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (5:0,5) - Symbols:1
+                CSharpSymbolType.RazorCommentTransition;[@];
+            MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (6:0,6) - Symbols:1
+                CSharpSymbolType.RazorCommentStar;[*];
+            Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (7:0,7) - Symbols:1
+                CSharpSymbolType.Unknown;[];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.diagnostics.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.diagnostics.txt
new file mode 100644
index 0000000000..37d6bd7155
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.diagnostics.txt
@@ -0,0 +1,2 @@
+(1,3): Error RZ1028: End of file was reached before the end of the block comment.  All comments that start with the "@*" sequence must be terminated with a matching "*@" sequence.
+(1,2): Error RZ1006: The code block is missing a closing "}" character.  Make sure you have a matching "}" character for all the "{" characters within this block, and that none of the "}" characters are being interpreted as markup.
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.syntaxtree.txt
new file mode 100644
index 0000000000..9acfe929f8
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpRazorCommentsTest/UnterminatedRazorCommentInVerbatimBlock.syntaxtree.txt
@@ -0,0 +1,17 @@
+Markup block - Gen<None> - 4 - (0:0,0)
+    Markup span - Gen<Markup> - [] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:1
+        HtmlSymbolType.Unknown;[];
+    Statement block - Gen<None> - 4 - (0:0,0)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+            CSharpSymbolType.Transition;[@];
+        MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (1:0,1) - Symbols:1
+            CSharpSymbolType.LeftBrace;[{];
+        Code span - Gen<Stmt> - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[}];AtEOL - (2:0,2) - Symbols:1
+            CSharpSymbolType.Unknown;[];
+        Comment block - Gen<RazorComment> - 2 - (2:0,2)
+            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (2:0,2) - Symbols:1
+                CSharpSymbolType.RazorCommentTransition;[@];
+            MetaCode span - Gen<None> - [*] - SpanEditHandler;Accepts:None - (3:0,3) - Symbols:1
+                CSharpSymbolType.RazorCommentStar;[*];
+            Comment span - Gen<None> - [] - SpanEditHandler;Accepts:Any - (4:0,4) - Symbols:1
+                CSharpSymbolType.Unknown;[];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.diagnostics.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.diagnostics.txt
new file mode 100644
index 0000000000..7b748fffe4
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.diagnostics.txt
@@ -0,0 +1 @@
+(1,1): Error RZ1007: "namespace" is a reserved word and cannot be used in implicit expressions.  An explicit expression ("@()") must be used.
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.syntaxtree.txt
new file mode 100644
index 0000000000..700a0bc901
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWord.syntaxtree.txt
@@ -0,0 +1,3 @@
+Directive block - Gen<None> - 9 - (0:0,0)
+    MetaCode span - Gen<None> - [namespace] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+        CSharpSymbolType.Keyword;[namespace];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.syntaxtree.txt
new file mode 100644
index 0000000000..5e115a5168
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpReservedWordsTest/ReservedWordIsCaseSensitive.syntaxtree.txt
@@ -0,0 +1,3 @@
+Expression block - Gen<Expr> - 9 - (0:0,0)
+    Code span - Gen<Expr> - [NameSpace] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (0:0,0) - Symbols:1
+        CSharpSymbolType.Identifier;[NameSpace];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockAllowsMarkupInIfBodyWithBraces.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockAllowsMarkupInIfBodyWithBraces.syntaxtree.txt
new file mode 100644
index 0000000000..8b97a3aab7
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockAllowsMarkupInIfBodyWithBraces.syntaxtree.txt
@@ -0,0 +1,81 @@
+Statement block - Gen<None> - 70 - (0:0,0)
+    Code span - Gen<Stmt> - [if(foo) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:6
+        CSharpSymbolType.Keyword;[if];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[foo];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+    Markup block - Gen<None> - 12 - (9:0,9)
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (9:0,9) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+        Tag block - Gen<None> - 3 - (10:0,10)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (10:0,10) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (13:0,13) - Symbols:1
+            HtmlSymbolType.Text;[Bar];
+        Tag block - Gen<None> - 4 - (16:0,16)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (16:0,16) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (20:0,20) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+    Code span - Gen<Stmt> - [} else if(bar) {] - SpanEditHandler;Accepts:Any - (21:0,21) - Symbols:10
+        CSharpSymbolType.RightBrace;[}];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Keyword;[else];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Keyword;[if];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[bar];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+    Markup block - Gen<None> - 12 - (37:0,37)
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (37:0,37) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+        Tag block - Gen<None> - 3 - (38:0,38)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (38:0,38) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Baz] - SpanEditHandler;Accepts:Any - (41:0,41) - Symbols:1
+            HtmlSymbolType.Text;[Baz];
+        Tag block - Gen<None> - 4 - (44:0,44)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (44:0,44) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (48:0,48) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+    Code span - Gen<Stmt> - [} else {] - SpanEditHandler;Accepts:Any - (49:0,49) - Symbols:5
+        CSharpSymbolType.RightBrace;[}];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Keyword;[else];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+    Markup block - Gen<None> - 12 - (57:0,57)
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (57:0,57) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+        Tag block - Gen<None> - 3 - (58:0,58)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (58:0,58) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Boz] - SpanEditHandler;Accepts:Any - (61:0,61) - Symbols:1
+            HtmlSymbolType.Text;[Boz];
+        Tag block - Gen<None> - 4 - (64:0,64)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (64:0,64) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (68:0,68) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:None - (69:0,69) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockAllowsMarkupInIfBodyWithBracesWithinCodeBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockAllowsMarkupInIfBodyWithBracesWithinCodeBlock.syntaxtree.txt
new file mode 100644
index 0000000000..a0e6a7d0d0
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockAllowsMarkupInIfBodyWithBracesWithinCodeBlock.syntaxtree.txt
@@ -0,0 +1,87 @@
+Statement block - Gen<None> - 74 - (0:0,0)
+    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+        CSharpSymbolType.LeftBrace;[{];
+    Code span - Gen<Stmt> - [ if(foo) {] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Symbols:7
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Keyword;[if];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[foo];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+    Markup block - Gen<None> - 12 - (11:0,11)
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (11:0,11) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+        Tag block - Gen<None> - 3 - (12:0,12)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (12:0,12) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (15:0,15) - Symbols:1
+            HtmlSymbolType.Text;[Bar];
+        Tag block - Gen<None> - 4 - (18:0,18)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (18:0,18) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (22:0,22) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+    Code span - Gen<Stmt> - [} else if(bar) {] - SpanEditHandler;Accepts:Any - (23:0,23) - Symbols:10
+        CSharpSymbolType.RightBrace;[}];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Keyword;[else];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Keyword;[if];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[bar];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+    Markup block - Gen<None> - 12 - (39:0,39)
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (39:0,39) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+        Tag block - Gen<None> - 3 - (40:0,40)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (40:0,40) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Baz] - SpanEditHandler;Accepts:Any - (43:0,43) - Symbols:1
+            HtmlSymbolType.Text;[Baz];
+        Tag block - Gen<None> - 4 - (46:0,46)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (46:0,46) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (50:0,50) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+    Code span - Gen<Stmt> - [} else {] - SpanEditHandler;Accepts:Any - (51:0,51) - Symbols:5
+        CSharpSymbolType.RightBrace;[}];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Keyword;[else];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+    Markup block - Gen<None> - 12 - (59:0,59)
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (59:0,59) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+        Tag block - Gen<None> - 3 - (60:0,60)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (60:0,60) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Boz] - SpanEditHandler;Accepts:Any - (63:0,63) - Symbols:1
+            HtmlSymbolType.Text;[Boz];
+        Tag block - Gen<None> - 4 - (66:0,66)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (66:0,66) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (70:0,70) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+    Code span - Gen<Stmt> - [} ] - SpanEditHandler;Accepts:Any - (71:0,71) - Symbols:2
+        CSharpSymbolType.RightBrace;[}];
+        CSharpSymbolType.WhiteSpace;[ ];
+    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (73:0,73) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockCorrectlyReturnsFromMarkupBlockWithPseudoTag.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockCorrectlyReturnsFromMarkupBlockWithPseudoTag.syntaxtree.txt
new file mode 100644
index 0000000000..8767ea9b4e
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockCorrectlyReturnsFromMarkupBlockWithPseudoTag.syntaxtree.txt
@@ -0,0 +1,31 @@
+Statement block - Gen<None> - 29 - (0:0,0)
+    Code span - Gen<Stmt> - [if (i > 0) { ] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:12
+        CSharpSymbolType.Keyword;[if];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[i];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.GreaterThan;[>];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.IntegerLiteral;[0];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+        CSharpSymbolType.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) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[text];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [;] - SpanEditHandler;Accepts:None - (19:0,19) - Symbols:1
+            HtmlSymbolType.Text;[;];
+        Tag block - Gen<None> - 7 - (20:0,20)
+            Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (20:0,20) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[text];
+                HtmlSymbolType.CloseAngle;[>];
+    Code span - Gen<Stmt> - [ }] - SpanEditHandler;Accepts:Any - (27:0,27) - Symbols:2
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockCorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockCorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.syntaxtree.txt
new file mode 100644
index 0000000000..470eac3553
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockCorrectlyReturnsFromMarkupBlockWithPseudoTagInCodeBlock.syntaxtree.txt
@@ -0,0 +1,37 @@
+Statement block - Gen<None> - 33 - (0:0,0)
+    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+        CSharpSymbolType.LeftBrace;[{];
+    Code span - Gen<Stmt> - [ if (i > 0) { ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Symbols:13
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Keyword;[if];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[i];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.GreaterThan;[>];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.IntegerLiteral;[0];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+        CSharpSymbolType.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) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[text];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [;] - SpanEditHandler;Accepts:None - (21:0,21) - Symbols:1
+            HtmlSymbolType.Text;[;];
+        Tag block - Gen<None> - 7 - (22:0,22)
+            Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (22:0,22) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[text];
+                HtmlSymbolType.CloseAngle;[>];
+    Code span - Gen<Stmt> - [ } ] - SpanEditHandler;Accepts:Any - (29:0,29) - Symbols:3
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.RightBrace;[}];
+        CSharpSymbolType.WhiteSpace;[ ];
+    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (32:0,32) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesAllWhitespaceOnSameLineExcludingPreceedingNewlineButIncludingTrailingNewLineToMarkup.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesAllWhitespaceOnSameLineExcludingPreceedingNewlineButIncludingTrailingNewLineToMarkup.syntaxtree.txt
new file mode 100644
index 0000000000..2273388c86
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesAllWhitespaceOnSameLineExcludingPreceedingNewlineButIncludingTrailingNewLineToMarkup.syntaxtree.txt
@@ -0,0 +1,74 @@
+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) - Symbols:18
+        CSharpSymbolType.Keyword;[if];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[foo];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.Identifier;[var];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Identifier;[foo];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Assign;[=];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.StringLiteral;["After this statement there are 10 spaces"];
+        CSharpSymbolType.Semicolon;[;];
+        CSharpSymbolType.WhiteSpace;[          ];
+        CSharpSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 46 - (80:2,0)
+        Markup span - Gen<Markup> - [    ] - SpanEditHandler;Accepts:Any - (80:2,0) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[    ];
+        Tag block - Gen<None> - 3 - (84:2,4)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (84:2,4) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF        FooLF] - SpanEditHandler;Accepts:Any - (87:2,7) - Symbols:4
+            HtmlSymbolType.NewLine;[LF];
+            HtmlSymbolType.WhiteSpace;[        ];
+            HtmlSymbolType.Text;[Foo];
+            HtmlSymbolType.NewLine;[LF];
+        Expression block - Gen<Expr> - 12 - (102:4,0)
+            Code span - Gen<Stmt> - [        ] - SpanEditHandler;Accepts:Any - (102:4,0) - Symbols:1
+                CSharpSymbolType.WhiteSpace;[        ];
+            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (110:4,8) - Symbols:1
+                CSharpSymbolType.Transition;[@];
+            Code span - Gen<Expr> - [bar] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (111:4,9) - Symbols:1
+                CSharpSymbolType.Identifier;[bar];
+        Markup span - Gen<Markup> - [LF    ] - SpanEditHandler;Accepts:Any - (114:4,12) - Symbols:2
+            HtmlSymbolType.NewLine;[LF];
+            HtmlSymbolType.WhiteSpace;[    ];
+        Tag block - Gen<None> - 4 - (120:5,4)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (120:5,4) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (124:5,8) - Symbols:1
+            HtmlSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 14 - (126:6,0)
+        Markup span - Gen<Markup> - [    ] - SpanEditHandler;Accepts:Any - (126:6,0) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[    ];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (130:6,4) - Symbols:1
+            HtmlSymbolType.Transition;[@];
+        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (131:6,5) - Symbols:1
+            HtmlSymbolType.Colon;[:];
+        Markup span - Gen<Markup> - [Hello!LF] - SpanEditHandler;Accepts:None - (132:6,6) - Symbols:3
+            HtmlSymbolType.Text;[Hello];
+            HtmlSymbolType.Bang;[!];
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [    var biz = boz;LF}] - SpanEditHandler;Accepts:Any - (140:7,0) - Symbols:11
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.Identifier;[var];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Identifier;[biz];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Assign;[=];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Identifier;[boz];
+        CSharpSymbolType.Semicolon;[;];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.syntaxtree.txt
new file mode 100644
index 0000000000..6527c987fe
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnAtColonTemplateTransitionInDesignTimeMode.syntaxtree.txt
@@ -0,0 +1,25 @@
+Expression block - Gen<Expr> - 29 - (0:0,0)
+    Code span - Gen<Expr> - [Foo(    LF] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Symbols:4
+        CSharpSymbolType.Identifier;[Foo];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.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) - Symbols:1
+                HtmlSymbolType.Transition;[@];
+            MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (11:1,1) - Symbols:1
+                HtmlSymbolType.Colon;[:];
+            Markup span - Gen<Markup> - [<p>Foo</p>    LF] - SpanEditHandler;Accepts:None - (12:1,2) - Symbols:10
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+                HtmlSymbolType.Text;[Foo];
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+                HtmlSymbolType.WhiteSpace;[    ];
+                HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (28:2,0) - Symbols:1
+        CSharpSymbolType.RightParenthesis;[)];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.syntaxtree.txt
new file mode 100644
index 0000000000..9af8830a59
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnAtColonTransitionInDesignTimeMode.syntaxtree.txt
@@ -0,0 +1,26 @@
+Statement block - Gen<None> - 26 - (0:0,0)
+    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+        CSharpSymbolType.LeftBrace;[{];
+    Code span - Gen<Stmt> - [LF    ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Symbols:2
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+    Markup block - Gen<None> - 18 - (7:1,4)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (7:1,4) - Symbols:1
+            HtmlSymbolType.Transition;[@];
+        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (8:1,5) - Symbols:1
+            HtmlSymbolType.Colon;[:];
+        Markup span - Gen<Markup> - [<p>Foo</p>    LF] - SpanEditHandler;Accepts:None - (9:1,6) - Symbols:10
+            HtmlSymbolType.OpenAngle;[<];
+            HtmlSymbolType.Text;[p];
+            HtmlSymbolType.CloseAngle;[>];
+            HtmlSymbolType.Text;[Foo];
+            HtmlSymbolType.OpenAngle;[<];
+            HtmlSymbolType.ForwardSlash;[/];
+            HtmlSymbolType.Text;[p];
+            HtmlSymbolType.CloseAngle;[>];
+            HtmlSymbolType.WhiteSpace;[    ];
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [] - SpanEditHandler;Accepts:Any - (25:2,0) - Symbols:1
+        CSharpSymbolType.Unknown;[];
+    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (25:2,0) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.syntaxtree.txt
new file mode 100644
index 0000000000..03da3b909a
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnAtTagTemplateTransitionInDesignTimeMode.syntaxtree.txt
@@ -0,0 +1,25 @@
+Expression block - Gen<Expr> - 24 - (0:0,0)
+    Code span - Gen<Expr> - [Foo(    ] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Symbols:3
+        CSharpSymbolType.Identifier;[Foo];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.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) - Symbols:1
+                HtmlSymbolType.Transition;[@];
+            Tag block - Gen<None> - 3 - (9:0,9)
+                Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (9:0,9) - Symbols:3
+                    HtmlSymbolType.OpenAngle;[<];
+                    HtmlSymbolType.Text;[p];
+                    HtmlSymbolType.CloseAngle;[>];
+            Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (12:0,12) - Symbols:1
+                HtmlSymbolType.Text;[Foo];
+            Tag block - Gen<None> - 4 - (15:0,15)
+                Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (15:0,15) - Symbols:4
+                    HtmlSymbolType.OpenAngle;[<];
+                    HtmlSymbolType.ForwardSlash;[/];
+                    HtmlSymbolType.Text;[p];
+                    HtmlSymbolType.CloseAngle;[>];
+    Code span - Gen<Expr> - [    )] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (19:0,19) - Symbols:2
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.RightParenthesis;[)];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.diagnostics.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.diagnostics.txt
new file mode 100644
index 0000000000..fd4615efa6
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.diagnostics.txt
@@ -0,0 +1,5 @@
+(2,5): Error RZ1009: The "@" character must be followed by a ":", "(", or a C# identifier.  If you intended to switch to markup, use an HTML start tag, for example:
+
+@if(isLoggedIn) {
+    <p>Hello, @user!</p>
+}
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.syntaxtree.txt
new file mode 100644
index 0000000000..72ded8411b
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnInvalidAtTagTransitionInDesignTimeMode.syntaxtree.txt
@@ -0,0 +1,27 @@
+Statement block - Gen<None> - 25 - (0:0,0)
+    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+        CSharpSymbolType.LeftBrace;[{];
+    Code span - Gen<Stmt> - [LF    ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Symbols:2
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+    Markup block - Gen<None> - 11 - (7:1,4)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (7:1,4) - Symbols:1
+            HtmlSymbolType.Transition;[@];
+        Tag block - Gen<None> - 3 - (8:1,5)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (8:1,5) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (11:1,8) - Symbols:1
+            HtmlSymbolType.Text;[Foo];
+        Tag block - Gen<None> - 4 - (14:1,11)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (14:1,11) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+    Code span - Gen<Stmt> - [    LF] - SpanEditHandler;Accepts:Any - (18:1,15) - Symbols:2
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.NewLine;[LF];
+    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (24:2,0) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnTagTransitionInDesignTimeMode.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnTagTransitionInDesignTimeMode.syntaxtree.txt
new file mode 100644
index 0000000000..71972424ba
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockGivesSpacesToCodeOnTagTransitionInDesignTimeMode.syntaxtree.txt
@@ -0,0 +1,25 @@
+Statement block - Gen<None> - 24 - (0:0,0)
+    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+        CSharpSymbolType.LeftBrace;[{];
+    Code span - Gen<Stmt> - [LF    ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Symbols:2
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.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) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (10:1,7) - Symbols:1
+            HtmlSymbolType.Text;[Foo];
+        Tag block - Gen<None> - 4 - (13:1,10)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (13:1,10) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+    Code span - Gen<Stmt> - [    LF] - SpanEditHandler;Accepts:Any - (17:1,14) - Symbols:2
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.NewLine;[LF];
+    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (23:2,0) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnOpenAngleBracket.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnOpenAngleBracket.syntaxtree.txt
new file mode 100644
index 0000000000..4d5df85b66
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnOpenAngleBracket.syntaxtree.txt
@@ -0,0 +1,45 @@
+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) - Symbols:23
+        CSharpSymbolType.Keyword;[for];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Keyword;[int];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Identifier;[i];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Assign;[=];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.IntegerLiteral;[0];
+        CSharpSymbolType.Semicolon;[;];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Identifier;[i];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LessThan;[<];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.IntegerLiteral;[10];
+        CSharpSymbolType.Semicolon;[;];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Identifier;[i];
+        CSharpSymbolType.Increment;[++];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+    Markup block - Gen<None> - 12 - (29:0,29)
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (29:0,29) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+        Tag block - Gen<None> - 3 - (30:0,30)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (30:0,30) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (33:0,33) - Symbols:1
+            HtmlSymbolType.Text;[Foo];
+        Tag block - Gen<None> - 4 - (36:0,36)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (36:0,36) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (40:0,40) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:None - (41:0,41) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnOpenAngleBracketInCodeBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnOpenAngleBracketInCodeBlock.syntaxtree.txt
new file mode 100644
index 0000000000..9a96ec2028
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnOpenAngleBracketInCodeBlock.syntaxtree.txt
@@ -0,0 +1,51 @@
+Statement block - Gen<None> - 46 - (0:0,0)
+    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+        CSharpSymbolType.LeftBrace;[{];
+    Code span - Gen<Stmt> - [ for(int i = 0; i < 10; i++) {] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Symbols:24
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Keyword;[for];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Keyword;[int];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Identifier;[i];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Assign;[=];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.IntegerLiteral;[0];
+        CSharpSymbolType.Semicolon;[;];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Identifier;[i];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LessThan;[<];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.IntegerLiteral;[10];
+        CSharpSymbolType.Semicolon;[;];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Identifier;[i];
+        CSharpSymbolType.Increment;[++];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+    Markup block - Gen<None> - 12 - (31:0,31)
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (31:0,31) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+        Tag block - Gen<None> - 3 - (32:0,32)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (32:0,32) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (35:0,35) - Symbols:1
+            HtmlSymbolType.Text;[Foo];
+        Tag block - Gen<None> - 4 - (38:0,38)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (38:0,38) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:None - (42:0,42) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+    Code span - Gen<Stmt> - [} ] - SpanEditHandler;Accepts:Any - (43:0,43) - Symbols:2
+        CSharpSymbolType.RightBrace;[}];
+        CSharpSymbolType.WhiteSpace;[ ];
+    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (45:0,45) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByColon.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByColon.syntaxtree.txt
new file mode 100644
index 0000000000..be2d69622d
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByColon.syntaxtree.txt
@@ -0,0 +1,20 @@
+Statement block - Gen<None> - 18 - (0:0,0)
+    Code span - Gen<Stmt> - [if(foo) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:6
+        CSharpSymbolType.Keyword;[if];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[foo];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+    Markup block - Gen<None> - 8 - (9:0,9)
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (9:0,9) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Symbols:1
+            HtmlSymbolType.Transition;[@];
+        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (11:0,11) - Symbols:1
+            HtmlSymbolType.Colon;[:];
+        Markup span - Gen<Markup> - [BarLF] - SpanEditHandler;Accepts:None - (12:0,12) - Symbols:2
+            HtmlSymbolType.Text;[Bar];
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (17:1,0) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.syntaxtree.txt
new file mode 100644
index 0000000000..1fb5f39957
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByColonInCodeBlock.syntaxtree.txt
@@ -0,0 +1,26 @@
+Statement block - Gen<None> - 22 - (0:0,0)
+    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+        CSharpSymbolType.LeftBrace;[{];
+    Code span - Gen<Stmt> - [ if(foo) {] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Symbols:7
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Keyword;[if];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[foo];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+    Markup block - Gen<None> - 8 - (11:0,11)
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (11:0,11) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (12:0,12) - Symbols:1
+            HtmlSymbolType.Transition;[@];
+        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (13:0,13) - Symbols:1
+            HtmlSymbolType.Colon;[:];
+        Markup span - Gen<Markup> - [BarLF] - SpanEditHandler;Accepts:None - (14:0,14) - Symbols:2
+            HtmlSymbolType.Text;[Bar];
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [} ] - SpanEditHandler;Accepts:Any - (19:1,0) - Symbols:2
+        CSharpSymbolType.RightBrace;[}];
+        CSharpSymbolType.WhiteSpace;[ ];
+    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (21:1,2) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.syntaxtree.txt
new file mode 100644
index 0000000000..3ae830ee85
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByDoubleColon.syntaxtree.txt
@@ -0,0 +1,20 @@
+Statement block - Gen<None> - 24 - (0:0,0)
+    Code span - Gen<Stmt> - [if(foo) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:6
+        CSharpSymbolType.Keyword;[if];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[foo];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+    Markup block - Gen<None> - 14 - (9:0,9)
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (9:0,9) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Symbols:1
+            HtmlSymbolType.Transition;[@];
+        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (11:0,11) - Symbols:1
+            HtmlSymbolType.Colon;[:];
+        Markup span - Gen<Markup> - [:SometextLF] - SpanEditHandler;Accepts:None - (12:0,12) - Symbols:2
+            HtmlSymbolType.Text;[:Sometext];
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (23:1,0) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.syntaxtree.txt
new file mode 100644
index 0000000000..a8ed368280
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockParsesMarkupStatementOnSwitchCharacterFollowedByTripleColon.syntaxtree.txt
@@ -0,0 +1,20 @@
+Statement block - Gen<None> - 25 - (0:0,0)
+    Code span - Gen<Stmt> - [if(foo) {] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:6
+        CSharpSymbolType.Keyword;[if];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[foo];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+    Markup block - Gen<None> - 15 - (9:0,9)
+        Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (9:0,9) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[ ];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (10:0,10) - Symbols:1
+            HtmlSymbolType.Transition;[@];
+        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (11:0,11) - Symbols:1
+            HtmlSymbolType.Colon;[:];
+        Markup span - Gen<Markup> - [::SometextLF] - SpanEditHandler;Accepts:None - (12:0,12) - Symbols:2
+            HtmlSymbolType.Text;[::Sometext];
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:Any - (24:1,0) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockShouldSupportMarkupWithoutPreceedingWhitespace.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockShouldSupportMarkupWithoutPreceedingWhitespace.syntaxtree.txt
new file mode 100644
index 0000000000..87ef2d9587
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockShouldSupportMarkupWithoutPreceedingWhitespace.syntaxtree.txt
@@ -0,0 +1,59 @@
+Statement block - Gen<None> - 67 - (0:0,0)
+    Code span - Gen<Stmt> - [foreach(var file in files){LFLFLF] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:14
+        CSharpSymbolType.Keyword;[foreach];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[var];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Identifier;[file];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Keyword;[in];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Identifier;[files];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.LeftBrace;[{];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 7 - (33:3,0)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (33:3,0) - Symbols:1
+            HtmlSymbolType.Transition;[@];
+        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (34:3,1) - Symbols:1
+            HtmlSymbolType.Colon;[:];
+        Markup span - Gen<Markup> - [BazLF] - SpanEditHandler;Accepts:None - (35:3,2) - Symbols:2
+            HtmlSymbolType.Text;[Baz];
+            HtmlSymbolType.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) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[br];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (45:4,5) - Symbols:1
+            HtmlSymbolType.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) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[a];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (50:5,3) - Symbols:1
+            HtmlSymbolType.Text;[Foo];
+        Tag block - Gen<None> - 4 - (53:5,6)
+            Markup span - Gen<Markup> - [</a>] - SpanEditHandler;Accepts:None - (53:5,6) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[a];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (57:5,10) - Symbols:1
+            HtmlSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 7 - (59:6,0)
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (59:6,0) - Symbols:1
+            HtmlSymbolType.Transition;[@];
+        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (60:6,1) - Symbols:1
+            HtmlSymbolType.Colon;[:];
+        Markup span - Gen<Markup> - [BarLF] - SpanEditHandler;Accepts:None - (61:6,2) - Symbols:2
+            HtmlSymbolType.Text;[Bar];
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:None - (66:7,0) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockShouldSupportSingleLineMarkupContainingStatementBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockShouldSupportSingleLineMarkupContainingStatementBlock.syntaxtree.txt
new file mode 100644
index 0000000000..c9bef199fd
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockShouldSupportSingleLineMarkupContainingStatementBlock.syntaxtree.txt
@@ -0,0 +1,29 @@
+Expression block - Gen<Expr> - 25 - (0:0,0)
+    Code span - Gen<Expr> - [Repeat(10,LF    ] - ImplicitExpressionEditHandler;Accepts:Any;ImplicitExpression[RTD];K14 - (0:0,0) - Symbols:6
+        CSharpSymbolType.Identifier;[Repeat];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.IntegerLiteral;[10];
+        CSharpSymbolType.Comma;[,];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.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) - Symbols:1
+                HtmlSymbolType.Transition;[@];
+            MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (17:1,5) - Symbols:1
+                HtmlSymbolType.Colon;[:];
+            Markup span - Gen<Markup> - [ ] - SpanEditHandler;Accepts:Any - (18:1,6) - Symbols:1
+                HtmlSymbolType.WhiteSpace;[ ];
+            Statement block - Gen<None> - 3 - (19:1,7)
+                Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (19:1,7) - Symbols:1
+                    CSharpSymbolType.Transition;[@];
+                MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (20:1,8) - Symbols:1
+                    CSharpSymbolType.LeftBrace;[{];
+                Code span - Gen<Stmt> - [] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (21:1,9) - Symbols:1
+                    CSharpSymbolType.Unknown;[];
+                MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (21:1,9) - Symbols:1
+                    CSharpSymbolType.RightBrace;[}];
+            Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (22:1,10) - Symbols:1
+                HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Expr> - [)] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (24:2,0) - Symbols:1
+        CSharpSymbolType.RightParenthesis;[)];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockSupportsAllKindsOfImplicitMarkupInCodeBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockSupportsAllKindsOfImplicitMarkupInCodeBlock.syntaxtree.txt
new file mode 100644
index 0000000000..f96db274d6
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockSupportsAllKindsOfImplicitMarkupInCodeBlock.syntaxtree.txt
@@ -0,0 +1,122 @@
+Statement block - Gen<None> - 206 - (0:0,0)
+    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+        CSharpSymbolType.LeftBrace;[{];
+    Code span - Gen<Stmt> - [LF    if(true) {LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Symbols:9
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.Keyword;[if];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Keyword;[true];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+        CSharpSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 30 - (19:2,0)
+        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (19:2,0) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[        ];
+        Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (27:2,8) - Symbols:1
+            HtmlSymbolType.Transition;[@];
+        MetaCode span - Gen<None> - [:] - SpanEditHandler;Accepts:Any - (28:2,9) - Symbols:1
+            HtmlSymbolType.Colon;[:];
+        Markup span - Gen<Markup> - [Single Line MarkupLF] - SpanEditHandler;Accepts:None - (29:2,10) - Symbols:6
+            HtmlSymbolType.Text;[Single];
+            HtmlSymbolType.WhiteSpace;[ ];
+            HtmlSymbolType.Text;[Line];
+            HtmlSymbolType.WhiteSpace;[ ];
+            HtmlSymbolType.Text;[Markup];
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [    }LF    foreach (var p in Enumerable.Range(1, 10)) {LF        ] - SpanEditHandler;Accepts:Any - (49:3,0) - Symbols:27
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.RightBrace;[}];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.Keyword;[foreach];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[var];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Identifier;[p];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Keyword;[in];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Identifier;[Enumerable];
+        CSharpSymbolType.Dot;[.];
+        CSharpSymbolType.Identifier;[Range];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.IntegerLiteral;[1];
+        CSharpSymbolType.Comma;[,];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.IntegerLiteral;[10];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.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) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[text];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [The number is ] - SpanEditHandler;Accepts:None - (120:5,14) - Symbols:6
+            HtmlSymbolType.Text;[The];
+            HtmlSymbolType.WhiteSpace;[ ];
+            HtmlSymbolType.Text;[number];
+            HtmlSymbolType.WhiteSpace;[ ];
+            HtmlSymbolType.Text;[is];
+            HtmlSymbolType.WhiteSpace;[ ];
+        Expression block - Gen<Expr> - 2 - (134:5,28)
+            Transition span - Gen<None> - [@] - SpanEditHandler;Accepts:None - (134:5,28) - Symbols:1
+                CSharpSymbolType.Transition;[@];
+            Code span - Gen<Expr> - [p] - ImplicitExpressionEditHandler;Accepts:NonWhiteSpace;ImplicitExpression[RTD];K14 - (135:5,29) - Symbols:1
+                CSharpSymbolType.Identifier;[p];
+        Tag block - Gen<None> - 7 - (136:5,30)
+            Transition span - Gen<None> - [</text>] - SpanEditHandler;Accepts:None - (136:5,30) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[text];
+                HtmlSymbolType.CloseAngle;[>];
+    Code span - Gen<Stmt> - [LF    }LF    if(!false) {LF] - SpanEditHandler;Accepts:Any - (143:5,37) - Symbols:13
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.RightBrace;[}];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.Keyword;[if];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Not;[!];
+        CSharpSymbolType.Keyword;[false];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+        CSharpSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 28 - (170:8,0)
+        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (170:8,0) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[        ];
+        Tag block - Gen<None> - 3 - (178:8,8)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (178:8,8) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [A real tag!] - SpanEditHandler;Accepts:Any - (181:8,11) - Symbols:6
+            HtmlSymbolType.Text;[A];
+            HtmlSymbolType.WhiteSpace;[ ];
+            HtmlSymbolType.Text;[real];
+            HtmlSymbolType.WhiteSpace;[ ];
+            HtmlSymbolType.Text;[tag];
+            HtmlSymbolType.Bang;[!];
+        Tag block - Gen<None> - 4 - (192:8,22)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (192:8,22) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (196:8,26) - Symbols:1
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [    }LF] - SpanEditHandler;Accepts:Any - (198:9,0) - Symbols:3
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.RightBrace;[}];
+        CSharpSymbolType.NewLine;[LF];
+    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (205:10,0) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockSupportsMarkupInCaseAndDefaultBranchesOfSwitch.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockSupportsMarkupInCaseAndDefaultBranchesOfSwitch.syntaxtree.txt
new file mode 100644
index 0000000000..da956badcc
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockSupportsMarkupInCaseAndDefaultBranchesOfSwitch.syntaxtree.txt
@@ -0,0 +1,140 @@
+Statement block - Gen<None> - 232 - (0:0,0)
+    Code span - Gen<Stmt> - [switch(foo) {LF    case 0:LF] - SpanEditHandler;Accepts:Any - (0:0,0) - Symbols:13
+        CSharpSymbolType.Keyword;[switch];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[foo];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.Keyword;[case];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.IntegerLiteral;[0];
+        CSharpSymbolType.Colon;[:];
+        CSharpSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 20 - (28:2,0)
+        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (28:2,0) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[        ];
+        Tag block - Gen<None> - 3 - (36:2,8)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (36:2,8) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (39:2,11) - Symbols:1
+            HtmlSymbolType.Text;[Foo];
+        Tag block - Gen<None> - 4 - (42:2,14)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (42:2,14) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (46:2,18) - Symbols:1
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [        break;LF    case 1:LF] - SpanEditHandler;Accepts:Any - (48:3,0) - Symbols:10
+        CSharpSymbolType.WhiteSpace;[        ];
+        CSharpSymbolType.Keyword;[break];
+        CSharpSymbolType.Semicolon;[;];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.Keyword;[case];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.IntegerLiteral;[1];
+        CSharpSymbolType.Colon;[:];
+        CSharpSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 20 - (77:5,0)
+        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (77:5,0) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[        ];
+        Tag block - Gen<None> - 3 - (85:5,8)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (85:5,8) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (88:5,11) - Symbols:1
+            HtmlSymbolType.Text;[Bar];
+        Tag block - Gen<None> - 4 - (91:5,14)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (91:5,14) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (95:5,18) - Symbols:1
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [        return;LF    case 2:LF        {LF] - SpanEditHandler;Accepts:Any - (97:6,0) - Symbols:13
+        CSharpSymbolType.WhiteSpace;[        ];
+        CSharpSymbolType.Keyword;[return];
+        CSharpSymbolType.Semicolon;[;];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.Keyword;[case];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.IntegerLiteral;[2];
+        CSharpSymbolType.Colon;[:];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[        ];
+        CSharpSymbolType.LeftBrace;[{];
+        CSharpSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 24 - (138:9,0)
+        Markup span - Gen<Markup> - [            ] - SpanEditHandler;Accepts:Any - (138:9,0) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[            ];
+        Tag block - Gen<None> - 3 - (150:9,12)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (150:9,12) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Baz] - SpanEditHandler;Accepts:Any - (153:9,15) - Symbols:1
+            HtmlSymbolType.Text;[Baz];
+        Tag block - Gen<None> - 4 - (156:9,18)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (156:9,18) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (160:9,22) - Symbols:1
+            HtmlSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 24 - (162:10,0)
+        Markup span - Gen<Markup> - [            ] - SpanEditHandler;Accepts:Any - (162:10,0) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[            ];
+        Tag block - Gen<None> - 3 - (174:10,12)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (174:10,12) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Boz] - SpanEditHandler;Accepts:Any - (177:10,15) - Symbols:1
+            HtmlSymbolType.Text;[Boz];
+        Tag block - Gen<None> - 4 - (180:10,18)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (180:10,18) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (184:10,22) - Symbols:1
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [        }LF    default:LF] - SpanEditHandler;Accepts:Any - (186:11,0) - Symbols:7
+        CSharpSymbolType.WhiteSpace;[        ];
+        CSharpSymbolType.RightBrace;[}];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.Keyword;[default];
+        CSharpSymbolType.Colon;[:];
+        CSharpSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 20 - (211:13,0)
+        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (211:13,0) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[        ];
+        Tag block - Gen<None> - 3 - (219:13,8)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (219:13,8) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Biz] - SpanEditHandler;Accepts:Any - (222:13,11) - Symbols:1
+            HtmlSymbolType.Text;[Biz];
+        Tag block - Gen<None> - 4 - (225:13,14)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (225:13,14) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (229:13,18) - Symbols:1
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [}] - SpanEditHandler;Accepts:None - (231:14,0) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockSupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockSupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.syntaxtree.txt
new file mode 100644
index 0000000000..fd0a6c1c8d
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/ParseBlockSupportsMarkupInCaseAndDefaultBranchesOfSwitchInCodeBlock.syntaxtree.txt
@@ -0,0 +1,146 @@
+Statement block - Gen<None> - 236 - (0:0,0)
+    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+        CSharpSymbolType.LeftBrace;[{];
+    Code span - Gen<Stmt> - [ switch(foo) {LF    case 0:LF] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Symbols:14
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Keyword;[switch];
+        CSharpSymbolType.LeftParenthesis;[(];
+        CSharpSymbolType.Identifier;[foo];
+        CSharpSymbolType.RightParenthesis;[)];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.LeftBrace;[{];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.Keyword;[case];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.IntegerLiteral;[0];
+        CSharpSymbolType.Colon;[:];
+        CSharpSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 20 - (30:2,0)
+        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (30:2,0) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[        ];
+        Tag block - Gen<None> - 3 - (38:2,8)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (38:2,8) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Foo] - SpanEditHandler;Accepts:Any - (41:2,11) - Symbols:1
+            HtmlSymbolType.Text;[Foo];
+        Tag block - Gen<None> - 4 - (44:2,14)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (44:2,14) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (48:2,18) - Symbols:1
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [        break;LF    case 1:LF] - SpanEditHandler;Accepts:Any - (50:3,0) - Symbols:10
+        CSharpSymbolType.WhiteSpace;[        ];
+        CSharpSymbolType.Keyword;[break];
+        CSharpSymbolType.Semicolon;[;];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.Keyword;[case];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.IntegerLiteral;[1];
+        CSharpSymbolType.Colon;[:];
+        CSharpSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 20 - (79:5,0)
+        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (79:5,0) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[        ];
+        Tag block - Gen<None> - 3 - (87:5,8)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (87:5,8) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Bar] - SpanEditHandler;Accepts:Any - (90:5,11) - Symbols:1
+            HtmlSymbolType.Text;[Bar];
+        Tag block - Gen<None> - 4 - (93:5,14)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (93:5,14) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (97:5,18) - Symbols:1
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [        return;LF    case 2:LF        {LF] - SpanEditHandler;Accepts:Any - (99:6,0) - Symbols:13
+        CSharpSymbolType.WhiteSpace;[        ];
+        CSharpSymbolType.Keyword;[return];
+        CSharpSymbolType.Semicolon;[;];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.Keyword;[case];
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.IntegerLiteral;[2];
+        CSharpSymbolType.Colon;[:];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[        ];
+        CSharpSymbolType.LeftBrace;[{];
+        CSharpSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 24 - (140:9,0)
+        Markup span - Gen<Markup> - [            ] - SpanEditHandler;Accepts:Any - (140:9,0) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[            ];
+        Tag block - Gen<None> - 3 - (152:9,12)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (152:9,12) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Baz] - SpanEditHandler;Accepts:Any - (155:9,15) - Symbols:1
+            HtmlSymbolType.Text;[Baz];
+        Tag block - Gen<None> - 4 - (158:9,18)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (158:9,18) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (162:9,22) - Symbols:1
+            HtmlSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 24 - (164:10,0)
+        Markup span - Gen<Markup> - [            ] - SpanEditHandler;Accepts:Any - (164:10,0) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[            ];
+        Tag block - Gen<None> - 3 - (176:10,12)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (176:10,12) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Boz] - SpanEditHandler;Accepts:Any - (179:10,15) - Symbols:1
+            HtmlSymbolType.Text;[Boz];
+        Tag block - Gen<None> - 4 - (182:10,18)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (182:10,18) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (186:10,22) - Symbols:1
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [        }LF    default:LF] - SpanEditHandler;Accepts:Any - (188:11,0) - Symbols:7
+        CSharpSymbolType.WhiteSpace;[        ];
+        CSharpSymbolType.RightBrace;[}];
+        CSharpSymbolType.NewLine;[LF];
+        CSharpSymbolType.WhiteSpace;[    ];
+        CSharpSymbolType.Keyword;[default];
+        CSharpSymbolType.Colon;[:];
+        CSharpSymbolType.NewLine;[LF];
+    Markup block - Gen<None> - 20 - (213:13,0)
+        Markup span - Gen<Markup> - [        ] - SpanEditHandler;Accepts:Any - (213:13,0) - Symbols:1
+            HtmlSymbolType.WhiteSpace;[        ];
+        Tag block - Gen<None> - 3 - (221:13,8)
+            Markup span - Gen<Markup> - [<p>] - SpanEditHandler;Accepts:None - (221:13,8) - Symbols:3
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [Biz] - SpanEditHandler;Accepts:Any - (224:13,11) - Symbols:1
+            HtmlSymbolType.Text;[Biz];
+        Tag block - Gen<None> - 4 - (227:13,14)
+            Markup span - Gen<Markup> - [</p>] - SpanEditHandler;Accepts:None - (227:13,14) - Symbols:4
+                HtmlSymbolType.OpenAngle;[<];
+                HtmlSymbolType.ForwardSlash;[/];
+                HtmlSymbolType.Text;[p];
+                HtmlSymbolType.CloseAngle;[>];
+        Markup span - Gen<Markup> - [LF] - SpanEditHandler;Accepts:None - (231:13,18) - Symbols:1
+            HtmlSymbolType.NewLine;[LF];
+    Code span - Gen<Stmt> - [} ] - SpanEditHandler;Accepts:Any - (233:14,0) - Symbols:2
+        CSharpSymbolType.RightBrace;[}];
+        CSharpSymbolType.WhiteSpace;[ ];
+    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (235:14,2) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];
diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.syntaxtree.txt b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.syntaxtree.txt
new file mode 100644
index 0000000000..47749c8e8e
--- /dev/null
+++ b/test/Microsoft.AspNetCore.Razor.Language.Test/TestFiles/ParserTests/CSharpToMarkupSwitchTest/SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated.syntaxtree.txt
@@ -0,0 +1,10 @@
+Statement block - Gen<None> - 9 - (0:0,0)
+    MetaCode span - Gen<None> - [{] - SpanEditHandler;Accepts:None - (0:0,0) - Symbols:1
+        CSharpSymbolType.LeftBrace;[{];
+    Code span - Gen<Stmt> - [ List< ] - AutoCompleteEditHandler;Accepts:Any,AutoComplete:[<null>];AtEOL - (1:0,1) - Symbols:4
+        CSharpSymbolType.WhiteSpace;[ ];
+        CSharpSymbolType.Identifier;[List];
+        CSharpSymbolType.LessThan;[<];
+        CSharpSymbolType.WhiteSpace;[ ];
+    MetaCode span - Gen<None> - [}] - SpanEditHandler;Accepts:None - (8:0,8) - Symbols:1
+        CSharpSymbolType.RightBrace;[}];