Support closed void tags with content in code blocks

Author: jjonescz

src/Compiler/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs

@@ -704,6 +704,28 @@ private MarkupStartTagSyntax ParseStartTag(
                     {
                         // There is no matching end void tag.
                         tagMode = MarkupTagMode.Void;
+
+                        // Try looking (until the end of the code block) for a matching end tag.
+                        // This needs to be supported in case the tag is actually a component.
+                        while (!EndOfFile && !At(SyntaxKind.RightBrace))
+                        {
+                            if (At(SyntaxKind.OpenAngle) && NextIs(SyntaxKind.ForwardSlash))
+                            {
+                                NextToken();
+                                Assert(SyntaxKind.ForwardSlash);
+                                NextToken();
+                                if (At(SyntaxKind.Text) && string.Equals(CurrentToken.Content, tagName, StringComparison.OrdinalIgnoreCase))
+                                {
+                                    // Found matching end tag.
+                                    tagMode = MarkupTagMode.Normal;
+                                    break;
+                                }
+                            }
+                            else
+                            {
+                                NextToken();
+                            }
+                        }
                     }
 
                     // Go back to the bookmark and just finish this tag at the close angle

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/Component_Col.cspans.txt

@@ -2,6 +2,8 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
 Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
-Code span at (7:0,7 [19] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [27] )
+Markup span at (7:0,7 [13] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [24] )
+Markup span at (20:0,20 [6] ) (Accepts:None) - Parent: Tag block at (20:0,20 [6] )
+Code span at (26:0,26 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [27] )
 MetaCode span at (26:0,26 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [27] )
 Markup span at (27:0,27 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [27] )

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/Component_Col.stree.txt

@@ -10,22 +10,25 @@
                     RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
                         LeftBrace;[{];
                     CSharpCodeBlock - [2..26)::24
-                        MarkupBlock - [2..7)::5
-                            MarkupElement - [2..7)::5
+                        MarkupBlock - [2..26)::24
+                            MarkupElement - [2..26)::24
                                 MarkupStartTag - [2..7)::5 - [<Col>] - Gen<Markup> - SpanEditHandler;Accepts:None
                                     OpenAngle;[<];
                                     Text;[Col];
                                     CloseAngle;[>];
-                        CSharpStatementLiteral - [7..26)::19 - [in code block</Col>] - Gen<Stmt> - SpanEditHandler;Accepts:Any
-                            Keyword;[in];
-                            Whitespace;[ ];
-                            Identifier;[code];
-                            Whitespace;[ ];
-                            Identifier;[block];
-                            LessThan;[<];
-                            Slash;[/];
-                            Identifier;[Col];
-                            GreaterThan;[>];
+                                MarkupTextLiteral - [7..20)::13 - [in code block] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[in];
+                                    Whitespace;[ ];
+                                    Text;[code];
+                                    Whitespace;[ ];
+                                    Text;[block];
+                                MarkupEndTag - [20..26)::6 - [</Col>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[Col];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [26..26)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
                     RazorMetaCode - [26..27)::1 - Gen<None> - SpanEditHandler;Accepts:None
                         RightBrace;[}];
         MarkupTextLiteral - [27..27)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/Component_Input.cspans.txt

@@ -2,6 +2,8 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
 Markup span at (2:0,2 [7] ) (Accepts:None) - Parent: Tag block at (2:0,2 [7] )
-Code span at (9:0,9 [21] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [31] )
+Markup span at (9:0,9 [13] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [28] )
+Markup span at (22:0,22 [8] ) (Accepts:None) - Parent: Tag block at (22:0,22 [8] )
+Code span at (30:0,30 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [31] )
 MetaCode span at (30:0,30 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [31] )
 Markup span at (31:0,31 [0] ) (Accepts:Any) - Parent: Markup block at (0:0,0 [31] )

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/Component_Input.stree.txt

@@ -10,22 +10,25 @@
                     RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
                         LeftBrace;[{];
                     CSharpCodeBlock - [2..30)::28
-                        MarkupBlock - [2..9)::7
-                            MarkupElement - [2..9)::7
+                        MarkupBlock - [2..30)::28
+                            MarkupElement - [2..30)::28
                                 MarkupStartTag - [2..9)::7 - [<Input>] - Gen<Markup> - SpanEditHandler;Accepts:None
                                     OpenAngle;[<];
                                     Text;[Input];
                                     CloseAngle;[>];
-                        CSharpStatementLiteral - [9..30)::21 - [in code block</Input>] - Gen<Stmt> - SpanEditHandler;Accepts:Any
-                            Keyword;[in];
-                            Whitespace;[ ];
-                            Identifier;[code];
-                            Whitespace;[ ];
-                            Identifier;[block];
-                            LessThan;[<];
-                            Slash;[/];
-                            Identifier;[Input];
-                            GreaterThan;[>];
+                                MarkupTextLiteral - [9..22)::13 - [in code block] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[in];
+                                    Whitespace;[ ];
+                                    Text;[code];
+                                    Whitespace;[ ];
+                                    Text;[block];
+                                MarkupEndTag - [22..30)::8 - [</Input>] - Gen<Markup> - SpanEditHandler;Accepts:None
+                                    OpenAngle;[<];
+                                    ForwardSlash;[/];
+                                    Text;[Input];
+                                    CloseAngle;[>];
+                        CSharpStatementLiteral - [30..30)::0 - [] - Gen<Stmt> - SpanEditHandler;Accepts:Any
+                            Marker;[];
                     RazorMetaCode - [30..31)::1 - Gen<None> - SpanEditHandler;Accepts:None
                         RightBrace;[}];
         MarkupTextLiteral - [31..31)::0 - [] - Gen<Markup> - SpanEditHandler;Accepts:Any

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/VoidTag_ClosedLater.cspans.txt

@@ -2,7 +2,7 @@
 Transition span at (0:0,0 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
 MetaCode span at (1:0,1 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )
 Markup span at (2:0,2 [5] ) (Accepts:None) - Parent: Tag block at (2:0,2 [5] )
-Code span at (7:0,7 [16] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [30] )
+Markup span at (7:0,7 [16] ) (Accepts:Any) - Parent: Markup block at (2:0,2 [27] )
 Markup span at (23:0,23 [6] ) (Accepts:None) - Parent: Tag block at (23:0,23 [6] )
 Code span at (29:0,29 [0] ) (Accepts:Any) - Parent: Statement block at (0:0,0 [30] )
 MetaCode span at (29:0,29 [1] ) (Accepts:None) - Parent: Statement block at (0:0,0 [30] )

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/TestFiles/ParserTests/HtmlBlockTest/VoidTag_ClosedLater.diag.txt

@@ -10,24 +10,20 @@
                     RazorMetaCode - [1..2)::1 - Gen<None> - SpanEditHandler;Accepts:None
                         LeftBrace;[{];
                     CSharpCodeBlock - [2..29)::27
-                        MarkupBlock - [2..7)::5
-                            MarkupElement - [2..7)::5
+                        MarkupBlock - [2..29)::27
+                            MarkupElement - [2..29)::27
                                 MarkupStartTag - [2..7)::5 - [<col>] - Gen<Markup> - SpanEditHandler;Accepts:None
                                     OpenAngle;[<];
                                     Text;[col];
                                     CloseAngle;[>];
-                        CSharpStatementLiteral - [7..23)::16 - [while (true) { }] - Gen<Stmt> - SpanEditHandler;Accepts:Any
-                            Keyword;[while];
-                            Whitespace;[ ];
-                            LeftParenthesis;[(];
-                            Keyword;[true];
-                            RightParenthesis;[)];
-                            Whitespace;[ ];
-                            LeftBrace;[{];
-                            Whitespace;[ ];
-                            RightBrace;[}];
-                        MarkupBlock - [23..29)::6
-                            MarkupElement - [23..29)::6
+                                MarkupTextLiteral - [7..23)::16 - [while (true) { }] - Gen<Markup> - SpanEditHandler;Accepts:Any
+                                    Text;[while];
+                                    Whitespace;[ ];
+                                    Text;[(true)];
+                                    Whitespace;[ ];
+                                    Text;[{];
+                                    Whitespace;[ ];
+                                    Text;[}];
                                 MarkupEndTag - [23..29)::6 - [</col>] - Gen<Markup> - SpanEditHandler;Accepts:None
                                     OpenAngle;[<];
                                     ForwardSlash;[/];