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

Update missed GlobalImport naming bits in MvcRazorParser. 

- These names used to be ViewStart based but were changed (for directive inheritance) to come from GlobalImport.
This commit is contained in:
N. Taylor Mullen 2015-03-02 21:56:16 -08:00
parent bc0ac4d0ea
commit e4b1242328
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Mvc.Razor
/// </summary> /// </summary>
public class MvcRazorParser : RazorParser public class MvcRazorParser : RazorParser
{ {
private readonly IEnumerable<TagHelperDirectiveDescriptor> _viewStartDirectiveDescriptors; private readonly IEnumerable<TagHelperDirectiveDescriptor> _globalImportDirectiveDescriptors;
/// <summary> /// <summary>
/// Initializes a new instance of <see cref="MvcRazorParser"/>. /// Initializes a new instance of <see cref="MvcRazorParser"/>.
@ -36,7 +36,7 @@ namespace Microsoft.AspNet.Mvc.Razor
: base(parser) : base(parser)
{ {
// Construct tag helper descriptors from @addTagHelper and @removeTagHelper chunks // Construct tag helper descriptors from @addTagHelper and @removeTagHelper chunks
_viewStartDirectiveDescriptors = GetTagHelperDescriptors(inheritedCodeTrees, defaultInheritedChunks); _globalImportDirectiveDescriptors = GetTagHelperDirectiveDescriptors(inheritedCodeTrees, defaultInheritedChunks);
} }
/// <inheritdoc /> /// <inheritdoc />
@ -44,13 +44,14 @@ namespace Microsoft.AspNet.Mvc.Razor
[NotNull] Block documentRoot, [NotNull] Block documentRoot,
[NotNull] ParserErrorSink errorSink) [NotNull] ParserErrorSink errorSink)
{ {
var visitor = new ViewStartAddRemoveTagHelperVisitor(TagHelperDescriptorResolver, var visitor = new GlobalImportAddRemoveTagHelperVisitor(
_viewStartDirectiveDescriptors, TagHelperDescriptorResolver,
errorSink); _globalImportDirectiveDescriptors,
errorSink);
return visitor.GetDescriptors(documentRoot); return visitor.GetDescriptors(documentRoot);
} }
private static IEnumerable<TagHelperDirectiveDescriptor> GetTagHelperDescriptors( private static IEnumerable<TagHelperDirectiveDescriptor> GetTagHelperDirectiveDescriptors(
IReadOnlyList<CodeTree> inheritedCodeTrees, IReadOnlyList<CodeTree> inheritedCodeTrees,
IReadOnlyList<Chunk> defaultInheritedChunks) IReadOnlyList<Chunk> defaultInheritedChunks)
{ {
@ -89,17 +90,17 @@ namespace Microsoft.AspNet.Mvc.Razor
return descriptors; return descriptors;
} }
private class ViewStartAddRemoveTagHelperVisitor : TagHelperDirectiveSpanVisitor private class GlobalImportAddRemoveTagHelperVisitor : TagHelperDirectiveSpanVisitor
{ {
private readonly IEnumerable<TagHelperDirectiveDescriptor> _viewStartDirectiveDescriptors; private readonly IEnumerable<TagHelperDirectiveDescriptor> _globalImportDirectiveDescriptors;
public ViewStartAddRemoveTagHelperVisitor( public GlobalImportAddRemoveTagHelperVisitor(
ITagHelperDescriptorResolver descriptorResolver, ITagHelperDescriptorResolver descriptorResolver,
IEnumerable<TagHelperDirectiveDescriptor> viewStartDirectiveDescriptors, IEnumerable<TagHelperDirectiveDescriptor> globalImportDirectiveDescriptors,
ParserErrorSink errorSink) ParserErrorSink errorSink)
: base(descriptorResolver, errorSink) : base(descriptorResolver, errorSink)
{ {
_viewStartDirectiveDescriptors = viewStartDirectiveDescriptors; _globalImportDirectiveDescriptors = globalImportDirectiveDescriptors;
} }
protected override TagHelperDescriptorResolutionContext GetTagHelperDescriptorResolutionContext( protected override TagHelperDescriptorResolutionContext GetTagHelperDescriptorResolutionContext(
@ -107,7 +108,7 @@ namespace Microsoft.AspNet.Mvc.Razor
ParserErrorSink errorSink) ParserErrorSink errorSink)
{ {
return base.GetTagHelperDescriptorResolutionContext( return base.GetTagHelperDescriptorResolutionContext(
_viewStartDirectiveDescriptors.Concat(descriptors), _globalImportDirectiveDescriptors.Concat(descriptors),
errorSink); errorSink);
} }
} }