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

Ignoring razor comments during validation

This commit is contained in:
Artak Mkrtchyan 2018-02-13 13:34:16 -08:00
parent 47228dd822
commit 679acdc5d4
No known key found for this signature in database
GPG Key ID: 64D580ACBA8CA645
2 changed files with 52 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,7 +116,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
continue; continue;
} }
} }
else if (!IsCommentTag((Span)child)) else if (!IsComment((Span)child))
{ {
ValidateParentAllowsContent((Span)child, errorSink); ValidateParentAllowsContent((Span)child, errorSink);
} }
@ -817,9 +817,12 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
return relevantSymbol.Type == HtmlSymbolType.ForwardSlash; return relevantSymbol.Type == HtmlSymbolType.ForwardSlash;
} }
private static bool IsCommentTag(Span span) private static bool IsComment(Span span)
{ {
return span.Content.StartsWith("<!--"); bool isHtmlComment = span.Content?.StartsWith("<!--") == true;
bool isRazorComment = span.Parent?.Type == BlockKindInternal.Comment;
return isHtmlComment || isRazorComment;
} }
private static void EnsureTagBlock(Block tagBlock) private static void EnsureTagBlock(Block tagBlock)

47
test/Microsoft.AspNetCore.Razor.Language.Test/Legacy/TagHelperParseTreeRewriterTest.cs
View File

@ -1109,7 +1109,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
} }
[Fact] [Fact]
public void Rewrite_AllowsCommentsAsChildren() public void Rewrite_AllowsHtmlCommentsAsChildren()
{ {
// Arrangestring documentContent, // Arrangestring documentContent,
IEnumerable<string> allowedChildren = new List<string> { "b" }; IEnumerable<string> allowedChildren = new List<string> { "b" };
@ -1148,6 +1148,51 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy
Array.Empty<RazorDiagnostic>()); Array.Empty<RazorDiagnostic>());
} }
[Fact]
public void Rewrite_AllowsRazorCommentsAsChildren()
{
// Arrangestring documentContent,
IEnumerable<string> allowedChildren = new List<string> { "b" };
string literal = "asdf";
string commentOutput = $"@*{literal}*@";
string expectedOutput = $"<p><b>{literal}</b>{commentOutput}</p>";
var pTagHelperBuilder = TagHelperDescriptorBuilder
.Create("PTagHelper", "SomeAssembly")
.TagMatchingRuleDescriptor(rule => rule.RequireTagName("p"));
foreach (var childTag in allowedChildren)
{
pTagHelperBuilder.AllowChildTag(childTag);
}
var descriptors = new TagHelperDescriptor[]
{
pTagHelperBuilder.Build()
};
var factory = new SpanFactory();
var blockFactory = new BlockFactory(factory);
var expectedMarkup = new MarkupBlock(
new MarkupTagHelperBlock("p",
blockFactory.MarkupTagBlock("<b>"),
factory.Markup(literal),
blockFactory.MarkupTagBlock("</b>"),
new CommentBlock(
Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition).Accepts(AcceptedCharactersInternal.None),
Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar).Accepts(AcceptedCharactersInternal.None),
Factory.Span(SpanKindInternal.Comment, new HtmlSymbol(literal, HtmlSymbolType.RazorComment)).Accepts(AcceptedCharactersInternal.Any),
Factory.MetaMarkup("*", HtmlSymbolType.RazorCommentStar).Accepts(AcceptedCharactersInternal.None),
Factory.MarkupTransition(HtmlSymbolType.RazorCommentTransition).Accepts(AcceptedCharactersInternal.None))));
// Act & Assert
EvaluateData(
descriptors,
expectedOutput,
expectedMarkup,
Array.Empty<RazorDiagnostic>());
}
[Fact] [Fact]
public void Rewrite_UnderstandsNullTagNameWithAllowedChildrenForCatchAll() public void Rewrite_UnderstandsNullTagNameWithAllowedChildrenForCatchAll()
{ {