huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix tag grouping for tags with no name 

\n\nCommit migrated from e24c9b25a4
This commit is contained in:
Ajay Bhargav Baaskaran 2019-01-22 12:48:43 -08:00 committed by Ajay Bhargav Baaskaran
parent f97ab076b5
commit 542d17bbfa
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/Razor/Microsoft.AspNetCore.Razor.Language/src/Legacy/HtmlMarkupParser.cs
View File

@ -480,7 +480,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
var endTagStart = CurrentStart; var endTagStart = CurrentStart;
var endTag = ParseEndTag(mode, out var endTagName, out var _); var endTag = ParseEndTag(mode, out var endTagName, out var _);
if (endTagName != null && string.Equals(CurrentStartTagName, endTagName, StringComparison.OrdinalIgnoreCase)) Debug.Assert(endTagName != null);
if (string.Equals(CurrentStartTagName, endTagName, StringComparison.OrdinalIgnoreCase))
{ {
// Happy path. Found a matching start tag. Create the element and reset the builder. // Happy path. Found a matching start tag. Create the element and reset the builder.
var tracker = _tagTracker.Pop(); var tracker = _tagTracker.Pop();
@ -520,7 +521,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// We can't possibly have a matching start tag. // We can't possibly have a matching start tag.
Context.ErrorSink.OnError( Context.ErrorSink.OnError(
RazorDiagnosticFactory.CreateParsing_UnexpectedEndTag( RazorDiagnosticFactory.CreateParsing_UnexpectedEndTag(
new SourceSpan(SourceLocationTracker.Advance(endTagStartLocation, "</"), endTagName.Length), endTagName)); new SourceSpan(SourceLocationTracker.Advance(endTagStartLocation, "</"), Math.Max(endTagName.Length, 1)), endTagName));
return; return;
} }
@ -602,8 +603,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
{ {
Assert(SyntaxKind.OpenAngle); Assert(SyntaxKind.OpenAngle);
tagName = null; tagName = string.Empty;
tagMode = MarkupTagMode.Invalid; tagMode = MarkupTagMode.Normal;
isWellFormed = false; isWellFormed = false;
var openAngleToken = EatCurrentToken(); // Accept '<' var openAngleToken = EatCurrentToken(); // Accept '<'
@ -612,7 +613,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
if (At(SyntaxKind.Text)) if (At(SyntaxKind.Text))
{ {
tagName = CurrentToken.Content; tagName = CurrentToken.Content;
tagMode = MarkupTagMode.Normal;
if (isBangEscape) if (isBangEscape)
{ {
@ -658,9 +658,9 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
Context.ErrorSink.OnError( Context.ErrorSink.OnError(
RazorDiagnosticFactory.CreateParsing_UnfinishedTag( RazorDiagnosticFactory.CreateParsing_UnfinishedTag(
new SourceSpan( new SourceSpan(
tagName == null ? tagStartLocation : SourceLocationTracker.Advance(tagStartLocation, "<"), tagName.Length == 0 ? tagStartLocation : SourceLocationTracker.Advance(tagStartLocation, "<"),
Math.Max(tagName?.Length ?? 0, 1)), Math.Max(tagName.Length, 1)),
tagName ?? string.Empty)); tagName));
} }
else else
{ {
@ -727,6 +727,15 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
} }
} }
if (tagNameToken.IsMissing && closeAngleToken.IsMissing)
{
// We want to consider tags with no name and no closing angle as invalid.
// E.g,
// <, < @DateTime.Now are all invalid tags
// <>, < @DateTime.Now>, <strong are all still valid.
tagMode = MarkupTagMode.Invalid;
}
return GetNodeWithSpanContext(startTag); return GetNodeWithSpanContext(startTag);
} }
@ -806,7 +815,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
// This section can accept things like: '</p >' or '</p>' etc. // This section can accept things like: '</p >' or '</p>' etc.
Assert(SyntaxKind.OpenAngle); Assert(SyntaxKind.OpenAngle);
tagName = null; tagName = string.Empty;
SyntaxToken tagNameToken = null; SyntaxToken tagNameToken = null;
var openAngleToken = EatCurrentToken(); // Accept '<' var openAngleToken = EatCurrentToken(); // Accept '<'