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

React to aspnet/Razor#210 changes. 

- Added the ErrorSink pass through values for our overridden classes.
This commit is contained in:
N. Taylor Mullen 2014-11-24 11:16:27 -08:00
parent a42fa3c800
commit e7941b5a84
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorParser.cs
View File

@ -32,16 +32,20 @@ namespace Microsoft.AspNet.Mvc.Razor
} }
/// <inheritdoc /> /// <inheritdoc />
protected override IEnumerable<TagHelperDescriptor> GetTagHelperDescriptors([NotNull] Block documentRoot) protected override IEnumerable<TagHelperDescriptor> GetTagHelperDescriptors(
[NotNull] Block documentRoot,
[NotNull] ParserErrorSink errorSink)
{ {
// Grab all the @addtaghelper chunks from view starts and construct TagHelperDirectiveDescriptors // Grab all the @addtaghelper chunks from view starts and construct TagHelperDirectiveDescriptors
var directiveDescriptors = _viewStartChunks.OfType<AddTagHelperChunk>() var directiveDescriptors = _viewStartChunks.OfType<AddTagHelperChunk>()
.Select(chunk => new TagHelperDirectiveDescriptor( .Select(chunk => new TagHelperDirectiveDescriptor(
chunk.LookupText, chunk.LookupText,
chunk.Start,
TagHelperDirectiveType.AddTagHelper)); TagHelperDirectiveType.AddTagHelper));
var visitor = new ViewStartAddRemoveTagHelperVisitor(TagHelperDescriptorResolver, var visitor = new ViewStartAddRemoveTagHelperVisitor(TagHelperDescriptorResolver,
directiveDescriptors); directiveDescriptors,
errorSink);
var descriptors = visitor.GetDescriptors(documentRoot); var descriptors = visitor.GetDescriptors(documentRoot);
return descriptors; return descriptors;
@ -53,17 +57,20 @@ namespace Microsoft.AspNet.Mvc.Razor
public ViewStartAddRemoveTagHelperVisitor( public ViewStartAddRemoveTagHelperVisitor(
ITagHelperDescriptorResolver descriptorResolver, ITagHelperDescriptorResolver descriptorResolver,
IEnumerable<TagHelperDirectiveDescriptor> viewStartDirectiveDescriptors) IEnumerable<TagHelperDirectiveDescriptor> viewStartDirectiveDescriptors,
: base(descriptorResolver) ParserErrorSink errorSink)
: base(descriptorResolver, errorSink)
{ {
_viewStartDirectiveDescriptors = viewStartDirectiveDescriptors; _viewStartDirectiveDescriptors = viewStartDirectiveDescriptors;
} }
protected override TagHelperDescriptorResolutionContext GetTagHelperDescriptorResolutionContext( protected override TagHelperDescriptorResolutionContext GetTagHelperDescriptorResolutionContext(
IEnumerable<TagHelperDirectiveDescriptor> descriptors) IEnumerable<TagHelperDirectiveDescriptor> descriptors,
ParserErrorSink errorSink)
{ {
return base.GetTagHelperDescriptorResolutionContext( return base.GetTagHelperDescriptorResolutionContext(
_viewStartDirectiveDescriptors.Concat(descriptors)); _viewStartDirectiveDescriptors.Concat(descriptors),
errorSink);
} }
} }
} }