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