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

Applied PR feedback (unit testst will be added as part of a separate commit)

This commit is contained in:
Artak Mkrtchyan 2018-03-08 13:29:18 -08:00
parent 32e2c533c7
commit 7357fa04ea
No known key found for this signature in database
GPG Key ID: 64D580ACBA8CA645
3 changed files with 45 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -496,6 +496,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
{ {
using (Context.Builder.StartBlock(BlockKindInternal.HtmlComment)) using (Context.Builder.StartBlock(BlockKindInternal.HtmlComment))
{ {
// Accept the double-hyphen symbol at the beginning of the comment block.
AcceptAndMoveNext(); AcceptAndMoveNext();
Output(SpanKindInternal.Markup, AcceptedCharactersInternal.None); Output(SpanKindInternal.Markup, AcceptedCharactersInternal.None);
@ -503,8 +504,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
while (!EndOfFile) while (!EndOfFile)
{ {
SkipToAndParseCode(HtmlSymbolType.DoubleHyphen); SkipToAndParseCode(HtmlSymbolType.DoubleHyphen);
if (At(HtmlSymbolType.DoubleHyphen))
{
var lastDoubleHyphen = AcceptAllButLastDoubleHypens(); var lastDoubleHyphen = AcceptAllButLastDoubleHypens();
if (At(HtmlSymbolType.CloseAngle)) if (At(HtmlSymbolType.CloseAngle))
@ -525,7 +524,6 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
} }
} }
} }
}
else if (CurrentSymbol.Type == HtmlSymbolType.LeftBracket) else if (CurrentSymbol.Type == HtmlSymbolType.LeftBracket)
{ {
if (AcceptAndMoveNext()) if (AcceptAndMoveNext())
@ -606,28 +604,27 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
} }
// Check condition 2.2 // Check condition 2.2
bool isValidComment = false; var isValidComment = false;
LookaheadUntil((s, p) => LookaheadUntil((s, p) =>
{ {
bool breakLookahead = false;
if (s.Type == HtmlSymbolType.DoubleHyphen) if (s.Type == HtmlSymbolType.DoubleHyphen)
{ {
if (NextIs(HtmlSymbolType.CloseAngle)) if (NextIs(HtmlSymbolType.CloseAngle))
{ {
// Check condition 2.3: We're at the end of a comment. Check to make sure the text ending is allowed. // Check condition 2.3: We're at the end of a comment. Check to make sure the text ending is allowed.
isValidComment = !SymbolSequenceEndsWithItems(p, HtmlSymbolType.OpenAngle, HtmlSymbolType.Bang, HtmlSymbolType.DoubleHyphen); isValidComment = !SymbolSequenceEndsWithItems(p, HtmlSymbolType.OpenAngle, HtmlSymbolType.Bang, HtmlSymbolType.DoubleHyphen);
breakLookahead = true; return true;
} }
else if (NextIs(ns => IsDashSymbol(ns) && NextIs(HtmlSymbolType.CloseAngle))) else if (NextIs(ns => IsDashSymbol(ns) && NextIs(HtmlSymbolType.CloseAngle)))
{ {
// This is also a valid closing comment case, as the dashes lookup is treated with DoubleHyphen symbols first. // This is also a valid closing comment case, as the dashes lookup is treated with DoubleHyphen symbols first.
isValidComment = true; isValidComment = true;
breakLookahead = true; return true;
} }
else if (NextIs(ns => ns.Type == HtmlSymbolType.Bang && NextIs(HtmlSymbolType.CloseAngle))) else if (NextIs(ns => ns.Type == HtmlSymbolType.Bang && NextIs(HtmlSymbolType.CloseAngle)))
{ {
isValidComment = false; isValidComment = false;
breakLookahead = true; return true;
} }
} }
else if (s.Type == HtmlSymbolType.OpenAngle) else if (s.Type == HtmlSymbolType.OpenAngle)
@ -635,11 +632,11 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
if (NextIs(ns => ns.Type == HtmlSymbolType.Bang && NextIs(HtmlSymbolType.DoubleHyphen))) if (NextIs(ns => ns.Type == HtmlSymbolType.Bang && NextIs(HtmlSymbolType.DoubleHyphen)))
{ {
isValidComment = false; isValidComment = false;
breakLookahead = true; return true;
} }
} }
return breakLookahead; return false;
}); });
return isValidComment; return isValidComment;

5
src/Microsoft.AspNetCore.Razor.Language/Legacy/TagHelperParseTreeRewriter.cs
View File

@ -487,6 +487,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
} }
private void ValidateParentAllowsContent(Span child, ErrorSink errorSink) private void ValidateParentAllowsContent(Span child, ErrorSink errorSink)
{
if (HasAllowedChildren())
{ {
var isDisallowedContent = true; var isDisallowedContent = true;
if (_featureFlags.AllowHtmlCommentsInTagHelpers) if (_featureFlags.AllowHtmlCommentsInTagHelpers)
@ -494,7 +496,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
isDisallowedContent = !IsComment(child) && child.Kind != SpanKindInternal.Transition && child.Kind != SpanKindInternal.Code; isDisallowedContent = !IsComment(child) && child.Kind != SpanKindInternal.Transition && child.Kind != SpanKindInternal.Code;
} }
if (HasAllowedChildren() && isDisallowedContent) if (isDisallowedContent)
{ {
var content = child.Content; var content = child.Content;
if (!string.IsNullOrWhiteSpace(content)) if (!string.IsNullOrWhiteSpace(content))
@ -513,6 +515,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
} }
} }
} }
}
private void ValidateParentAllowsPlainTag(Block tagBlock, ErrorSink errorSink) private void ValidateParentAllowsPlainTag(Block tagBlock, ErrorSink errorSink)
{ {

3
src/Microsoft.AspNetCore.Razor.Language/Legacy/TokenizerBackedParser.cs
View File

@ -122,9 +122,8 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
throw new ArgumentNullException(nameof(condition)); throw new ArgumentNullException(nameof(condition));
} }
bool matchFound = false; var matchFound = false;
// We add 1 in order to store the current symbol.
var symbols = new List<TSymbol>(); var symbols = new List<TSymbol>();
symbols.Add(CurrentSymbol); symbols.Add(CurrentSymbol);