From cb40da4e0fc1823805e9054c8f365df1f2dc70ff Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Thu, 6 Jul 2017 14:28:05 -0700 Subject: [PATCH] Rename ParseOnlyLeadingDirectives. - Was renamed to `ParseLeadingDirectives`. #1510 --- .../DefaultRazorParserOptions.cs | 6 +++--- .../DefaultRazorParserOptionsBuilder.cs | 4 ++-- .../Legacy/CSharpCodeParser.cs | 2 +- .../Legacy/HtmlMarkupParser.cs | 2 +- .../Legacy/ParserContext.cs | 4 ++-- .../RazorParserOptions.cs | 4 ++-- .../RazorParserOptionsBuilder.cs | 2 +- .../RazorSyntaxTreeTest.cs | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptions.cs b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptions.cs index 9f2825499a..d824d8d2b3 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptions.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptions.cs @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Razor.Language { internal class DefaultRazorParserOptions : RazorParserOptions { - public DefaultRazorParserOptions(DirectiveDescriptor[] directives, bool designTime, bool parseOnlyLeadingDirectives) + public DefaultRazorParserOptions(DirectiveDescriptor[] directives, bool designTime, bool parseLeadingDirectives) { if (directives == null) { @@ -17,13 +17,13 @@ namespace Microsoft.AspNetCore.Razor.Language Directives = directives; DesignTime = designTime; - ParseOnlyLeadingDirectives = parseOnlyLeadingDirectives; + ParseLeadingDirectives = parseLeadingDirectives; } public override bool DesignTime { get; } public override IReadOnlyCollection Directives { get; } - public override bool ParseOnlyLeadingDirectives { get; } + public override bool ParseLeadingDirectives { get; } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptionsBuilder.cs b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptionsBuilder.cs index 3b193030ee..0fa1e56fed 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptionsBuilder.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/DefaultRazorParserOptionsBuilder.cs @@ -17,11 +17,11 @@ namespace Microsoft.AspNetCore.Razor.Language public override ICollection Directives { get; } = new List(); - public override bool ParseOnlyLeadingDirectives { get; set; } + public override bool ParseLeadingDirectives { get; set; } public override RazorParserOptions Build() { - return new DefaultRazorParserOptions(Directives.ToArray(), DesignTime, ParseOnlyLeadingDirectives); + return new DefaultRazorParserOptions(Directives.ToArray(), DesignTime, ParseLeadingDirectives); } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs index 2b5eceda1e..881bf67150 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/CSharpCodeParser.cs @@ -61,7 +61,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy } public CSharpCodeParser(IEnumerable directives, ParserContext context) - : base(context.ParseOnlyLeadingDirectives ? FirstDirectiveCSharpLanguageCharacteristics.Instance : CSharpLanguageCharacteristics.Instance, context) + : base(context.ParseLeadingDirectives ? FirstDirectiveCSharpLanguageCharacteristics.Instance : CSharpLanguageCharacteristics.Instance, context) { if (directives == null) { diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs index 6c6aba95b8..0a7d84efd3 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/HtmlMarkupParser.cs @@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy }; public HtmlMarkupParser(ParserContext context) - : base(context.ParseOnlyLeadingDirectives ? FirstDirectiveHtmlLanguageCharacteristics.Instance : HtmlLanguageCharacteristics.Instance, context) + : base(context.ParseLeadingDirectives ? FirstDirectiveHtmlLanguageCharacteristics.Instance : HtmlLanguageCharacteristics.Instance, context) { } diff --git a/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserContext.cs b/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserContext.cs index 1207616604..189930e4d9 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserContext.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/Legacy/ParserContext.cs @@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy Source = new SeekableTextReader(chars, source.FilePath); DesignTimeMode = options.DesignTime; - ParseOnlyLeadingDirectives = options.ParseOnlyLeadingDirectives; + ParseLeadingDirectives = options.ParseLeadingDirectives; Builder = new SyntaxTreeBuilder(); ErrorSink = new ErrorSink(); SeenDirectives = new HashSet(StringComparer.Ordinal); @@ -41,7 +41,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Legacy public bool DesignTimeMode { get; } - public bool ParseOnlyLeadingDirectives { get; } + public bool ParseLeadingDirectives { get; } public bool WhiteSpaceIsSignificantToAncestorBlock { get; set; } diff --git a/src/Microsoft.AspNetCore.Razor.Language/RazorParserOptions.cs b/src/Microsoft.AspNetCore.Razor.Language/RazorParserOptions.cs index f65917862d..c060abef59 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/RazorParserOptions.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/RazorParserOptions.cs @@ -10,7 +10,7 @@ namespace Microsoft.AspNetCore.Razor.Language { public static RazorParserOptions CreateDefault() { - return new DefaultRazorParserOptions(Array.Empty(), designTime: false, parseOnlyLeadingDirectives: false); + return new DefaultRazorParserOptions(Array.Empty(), designTime: false, parseLeadingDirectives: false); } public static RazorParserOptions Create(Action configure) @@ -53,6 +53,6 @@ namespace Microsoft.AspNetCore.Razor.Language /// Currently setting this option to true will result in only the first line of directives being parsed. /// In a future release this may be updated to include all leading directive content. /// - public abstract bool ParseOnlyLeadingDirectives { get; } + public abstract bool ParseLeadingDirectives { get; } } } diff --git a/src/Microsoft.AspNetCore.Razor.Language/RazorParserOptionsBuilder.cs b/src/Microsoft.AspNetCore.Razor.Language/RazorParserOptionsBuilder.cs index fc119ec2af..d6a0d46f5c 100644 --- a/src/Microsoft.AspNetCore.Razor.Language/RazorParserOptionsBuilder.cs +++ b/src/Microsoft.AspNetCore.Razor.Language/RazorParserOptionsBuilder.cs @@ -11,7 +11,7 @@ namespace Microsoft.AspNetCore.Razor.Language public abstract ICollection Directives { get; } - public abstract bool ParseOnlyLeadingDirectives { get; set; } + public abstract bool ParseLeadingDirectives { get; set; } public abstract RazorParserOptions Build(); } diff --git a/test/Microsoft.AspNetCore.Razor.Language.Test/RazorSyntaxTreeTest.cs b/test/Microsoft.AspNetCore.Razor.Language.Test/RazorSyntaxTreeTest.cs index 908a72c141..54466376cd 100644 --- a/test/Microsoft.AspNetCore.Razor.Language.Test/RazorSyntaxTreeTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Language.Test/RazorSyntaxTreeTest.cs @@ -63,7 +63,7 @@ namespace Microsoft.AspNetCore.Razor.Language.Test { // Arrange var source = TestRazorSourceDocument.Create("\r\n \r\n @*SomeComment*@ \r\n @tagHelperPrefix \"SomePrefix\"\r\n\r\n@if (true) {\r\n @if(false) {
@something.
} \r\n}"); - var options = RazorParserOptions.Create(builder => builder.ParseOnlyLeadingDirectives = true); + var options = RazorParserOptions.Create(builder => builder.ParseLeadingDirectives = true); // Act var syntaxTree = RazorSyntaxTree.Parse(source, options);