Group HTML tags (#6)

Author: ajaybhargavb

src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanRewriter.cs

@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Razor.Language
 {
     internal class ClassifiedSpanRewriter : SyntaxRewriter
     {
-        public override SyntaxNode VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+        public override SyntaxNode VisitMarkupStartTag(MarkupStartTagSyntax node)
         {
             SpanContext latestSpanContext = null;
             var newChildren = SyntaxListBuilder<RazorSyntaxNode>.Create();
@@ -47,7 +47,7 @@ public override SyntaxNode VisitMarkupTagBlock(MarkupTagBlockSyntax node)
 
             AddLiteralIfExists();
 
-            return SyntaxFactory.MarkupTagBlock(newChildren.ToList()).Green.CreateRed(node.Parent, node.Position);
+            return SyntaxFactory.MarkupStartTag(newChildren.ToList()).Green.CreateRed(node.Parent, node.Position);
 
             void AddLiteralIfExists()
             {

src/Razor/Microsoft.AspNetCore.Razor.Language/src/ClassifiedSpanVisitor.cs

@@ -106,9 +106,14 @@ public override void VisitMarkupTagHelperAttributeValue(MarkupTagHelperAttribute
             base.VisitMarkupTagHelperAttributeValue(node);
         }
 
-        public override void VisitMarkupTagBlock(MarkupTagBlockSyntax node)
+        public override void VisitMarkupStartTag(MarkupStartTagSyntax node)
         {
-            WriteBlock(node, BlockKindInternal.Tag, base.VisitMarkupTagBlock);
+            WriteBlock(node, BlockKindInternal.Tag, base.VisitMarkupStartTag);
+        }
+
+        public override void VisitMarkupEndTag(MarkupEndTagSyntax node)
+        {
+            WriteBlock(node, BlockKindInternal.Tag, base.VisitMarkupEndTag);
         }
 
         public override void VisitMarkupTagHelperElement(MarkupTagHelperElementSyntax node)

src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/RazorParser.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNetCore.Razor.Language.Syntax;
 
 namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
@@ -41,7 +42,12 @@ public virtual RazorSyntaxTree Parse(RazorSourceDocument source)
             var diagnostics = context.ErrorSink.Errors;
 
             var root = markupParser.ParseDocument().CreateRed();
-            return RazorSyntaxTree.Create(root, source, diagnostics, Options);
+
+            var syntaxTree = RazorSyntaxTree.Create(root, source, diagnostics, Options);
+
+            // Group markup elements
+            syntaxTree = MarkupElementRewriter.AddMarkupElements(syntaxTree);
+            return syntaxTree;
         }
     }
 }

src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/TagHelperBlockRewriter.cs

@@ -10,13 +10,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
 {
     internal static class TagHelperBlockRewriter
     {
-        private static readonly string StringTypeName = typeof(string).FullName;
-
         public static MarkupTagHelperStartTagSyntax Rewrite(
             string tagName,
             bool validStructure,
             RazorParserFeatureFlags featureFlags,
-            MarkupTagBlockSyntax tag,
+            MarkupStartTagSyntax tag,
             TagHelperBinding bindingResult,
             ErrorSink errorSink,
             RazorSourceDocument source)
@@ -28,7 +26,7 @@ public static MarkupTagHelperStartTagSyntax Rewrite(
         }
 
         public static TagMode GetTagMode(
-            MarkupTagBlockSyntax tagBlock,
+            MarkupStartTagSyntax tagBlock,
             TagHelperBinding bindingResult,
             ErrorSink errorSink)
         {
@@ -57,7 +55,7 @@ public static TagMode GetTagMode(
         private static SyntaxList<RazorSyntaxNode> GetRewrittenChildren(
             string tagName,
             bool validStructure,
-            MarkupTagBlockSyntax tagBlock,
+            MarkupStartTagSyntax tagBlock,
             TagHelperBinding bindingResult,
             RazorParserFeatureFlags featureFlags,
             ErrorSink errorSink,