Fix invalid cast with end script tag containing code (dotnet/razor#193)

\n\nCommit migrated from dotnet/razor@56fa17b
dotnet · Feb 7, 2019 · daeb4f8 · daeb4f8
1 parent 73ca91f
commit daeb4f8
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
@@ -1357,8 +1357,6 @@ private void ParseJavascriptAndEndScriptTag(in SyntaxListBuilder<RazorSyntaxNode
                 var tagStart = CurrentStart;
                 builder.Add(OutputAsMarkupLiteral());
 
-                SpanContext.EditHandler.AcceptedCharacters = endTagAcceptedCharacters;
-
                 var openAngleToken = EatCurrentToken(); // '<'
                 var forwardSlashToken = EatCurrentToken(); // '/'
                 var tagNameToken = EatCurrentToken(); // 'script'
@@ -1369,8 +1367,10 @@ private void ParseJavascriptAndEndScriptTag(in SyntaxListBuilder<RazorSyntaxNode
                 {
                     var miscAttributeBuilder = pooledResult.Builder;
 
-                    ParseMarkupNodes(miscAttributeBuilder, ParseMode.Text, token => token.Kind == SyntaxKind.CloseAngle);
+                    // We want to accept malformed end tags as content.
+                    AcceptUntil(SyntaxKind.CloseAngle, SyntaxKind.OpenAngle);
                     miscAttributeBuilder.Add(OutputAsMarkupLiteral());
+
                     if (miscAttributeBuilder.Count > 0)
                     {
                         miscContent = SyntaxFactory.MarkupMiscAttributeContent(miscAttributeBuilder.ToList());
@@ -1390,6 +1390,8 @@ private void ParseJavascriptAndEndScriptTag(in SyntaxListBuilder<RazorSyntaxNode
                     }
                 }
 
+                SpanContext.EditHandler.AcceptedCharacters = endTagAcceptedCharacters;
+
                 endTag = SyntaxFactory.MarkupEndTag(
                     openAngleToken,
                     forwardSlashToken,