From c267ef39046b4a7602df1d14408ca0dc3ad36410 Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Wed, 21 Oct 2015 15:44:51 -0700 Subject: [PATCH] Rename `AppendEncoded()` to `AppendHtml()` and `SetContentEncoded()` to `SetHtmlContent()` - #3225, 3 of 3 --- .../TagHelperContentWrapperTextWriter.cs | 4 +-- .../LinkTagHelper.cs | 20 ++++++------ .../ScriptTagHelper.cs | 32 +++++++++---------- .../ViewFeatures/DefaultEditorTemplates.cs | 2 +- .../ViewFeatures/DefaultHtmlGenerator.cs | 2 +- .../RazorPageTest.cs | 14 ++++---- .../InputTagHelperTest.cs | 8 ++--- .../LabelTagHelperTest.cs | 8 ++--- .../SelectTagHelperTest.cs | 16 +++++----- .../ValidationMessageTagHelperTest.cs | 8 ++--- .../ValidationSummaryTagHelperTest.cs | 4 +-- .../Rendering/TagBuilderTest.cs | 2 +- .../TagHelpers/FooterTagHelper.cs | 4 +-- .../TagHelpers/AutoLinkerTagHelper.cs | 2 +- .../TagHelpers/BoldTagHelper.cs | 4 +-- .../TagHelpers/NestedViewImportsTagHelper.cs | 2 +- .../TagHelpers/RootViewStartTagHelper.cs | 2 +- .../TagHelpers/SurroundTagHelper.cs | 4 +-- .../TagCloudViewComponentTagHelper.cs | 2 +- .../TagHelpers/WebsiteInformationTagHelper.cs | 2 +- 20 files changed, 71 insertions(+), 71 deletions(-) diff --git a/src/Microsoft.AspNet.Mvc.Razor/TagHelperContentWrapperTextWriter.cs b/src/Microsoft.AspNet.Mvc.Razor/TagHelperContentWrapperTextWriter.cs index 339ddd5878..1baca26ced 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/TagHelperContentWrapperTextWriter.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/TagHelperContentWrapperTextWriter.cs @@ -54,13 +54,13 @@ namespace Microsoft.AspNet.Mvc.Razor /// public override void Write(string value) { - Content.AppendEncoded(value); + Content.AppendHtml(value); } /// public override void Write(char value) { - Content.AppendEncoded(value.ToString()); + Content.AppendHtml(value.ToString()); } /// diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs index 24bf46ecc5..c1a331fa33 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/LinkTagHelper.cs @@ -338,23 +338,23 @@ namespace Microsoft.AspNet.Mvc.TagHelpers // Build the tag that's used to test for the presence of the stylesheet builder - .AppendEncoded(""); + .AppendHtml("\" />"); // Build the "); + .AppendHtml(""); } } @@ -382,7 +382,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers private void BuildLinkTag(TagHelperAttributeList attributes, TagHelperContent builder) { - builder.AppendEncoded(""); + builder.AppendHtml("/>"); } private enum Mode diff --git a/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs b/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs index f0055e06aa..e72fb84277 100644 --- a/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs +++ b/src/Microsoft.AspNet.Mvc.TagHelpers/ScriptTagHelper.cs @@ -293,10 +293,10 @@ namespace Microsoft.AspNet.Mvc.TagHelpers if (fallbackSrcs.Any()) { // Build the "); + builder.AppendHtml("\"));"); } } @@ -371,7 +371,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers TagHelperAttributeList attributes, TagHelperContent builder) { - builder.AppendEncoded(""); + builder.AppendHtml(">"); } private void AppendAttribute(TagHelperContent content, string key, object value, bool escapeQuotes) { content - .AppendEncoded(" ") - .AppendEncoded(key); + .AppendHtml(" ") + .AppendHtml(key); if (escapeQuotes) { // Passed only JavaScript-encoded strings in this case. Do not perform HTML-encoding as well. content - .AppendEncoded("=\\\"") - .AppendEncoded((string)value) - .AppendEncoded("\\\""); + .AppendHtml("=\\\"") + .AppendHtml((string)value) + .AppendHtml("\\\""); } else { // HTML-encoded the given value if necessary. content - .AppendEncoded("=\"") + .AppendHtml("=\"") .Append(HtmlEncoder, ViewContext.Writer.Encoding, value) - .AppendEncoded("\""); + .AppendHtml("\""); } } diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultEditorTemplates.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultEditorTemplates.cs index 8f3949477e..88cf18785d 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultEditorTemplates.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultEditorTemplates.cs @@ -282,7 +282,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures valueDivTag.AddCssClass("editor-field"); valueDivTag.InnerHtml.Append(templateBuilderResult); - valueDivTag.InnerHtml.AppendEncoded(" "); + valueDivTag.InnerHtml.AppendHtml(" "); valueDivTag.InnerHtml.Append(htmlHelper.ValidationMessage( propertyMetadata.PropertyName, message: null, diff --git a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs index 65083dcc41..72dfd6bcf7 100644 --- a/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs +++ b/src/Microsoft.AspNet.Mvc.ViewFeatures/ViewFeatures/DefaultHtmlGenerator.cs @@ -818,7 +818,7 @@ namespace Microsoft.AspNet.Mvc.ViewFeatures if (!isHtmlSummaryModified) { - htmlSummary.InnerHtml.AppendEncoded(HiddenListItem); + htmlSummary.InnerHtml.AppendHtml(HiddenListItem); htmlSummary.InnerHtml.AppendLine(); } diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageTest.cs index 58eeffdc69..bb9211ec4c 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageTest.cs +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageTest.cs @@ -1658,7 +1658,7 @@ namespace Microsoft.AspNet.Mvc.Razor uniqueId: string.Empty, executeChildContentAsync: () => { - defaultTagHelperContent.AppendEncoded(input); + defaultTagHelperContent.AppendHtml(input); return Task.FromResult(result: true); }, startTagHelperWritingScope: () => { }, @@ -1702,7 +1702,7 @@ namespace Microsoft.AspNet.Mvc.Razor tagName: "p", attributes: new TagHelperAttributeList(), getChildContentAsync: (_) => Task.FromResult(new DefaultTagHelperContent())); - tagHelperExecutionContext.Output.Content.AppendEncoded("Hello World!"); + tagHelperExecutionContext.Output.Content.AppendHtml("Hello World!"); // Act var page = CreatePage(p => @@ -1763,11 +1763,11 @@ namespace Microsoft.AspNet.Mvc.Razor TagMode = tagMode }; - output.PreElement.AppendEncoded(preElement); - output.PreContent.AppendEncoded(preContent); - output.Content.AppendEncoded(content); - output.PostContent.AppendEncoded(postContent); - output.PostElement.AppendEncoded(postElement); + output.PreElement.AppendHtml(preElement); + output.PreContent.AppendHtml(preContent); + output.Content.AppendHtml(content); + output.PostContent.AppendHtml(postContent); + output.PostElement.AppendHtml(postElement); return output; } diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs index 362ce2014e..2d9e8e745e 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/InputTagHelperTest.cs @@ -98,7 +98,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { TagMode = TagMode.SelfClosing, }; - output.Content.AppendEncoded(originalContent); + output.Content.AppendHtml(originalContent); var htmlGenerator = new TestableHtmlGenerator(new EmptyModelMetadataProvider()); var tagHelper = GetTagHelper(htmlGenerator, model: false, propertyName: nameof(Model.IsACar)); @@ -277,9 +277,9 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { TagMode = TagMode.SelfClosing, }; - output.PreContent.AppendEncoded(expectedPreContent); - output.Content.AppendEncoded(originalContent); - output.PostContent.AppendEncoded(expectedPostContent); + output.PreContent.AppendHtml(expectedPreContent); + output.Content.AppendHtml(originalContent); + output.PostContent.AppendHtml(expectedPostContent); var htmlGenerator = new Mock(MockBehavior.Strict); var tagHelper = GetTagHelper(htmlGenerator.Object, model: false, propertyName: nameof(Model.IsACar)); diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LabelTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LabelTagHelperTest.cs index c989907bd0..23a813e78e 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LabelTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/LabelTagHelperTest.cs @@ -204,17 +204,17 @@ namespace Microsoft.AspNet.Mvc.TagHelpers getChildContentAsync: useCachedResult => { var tagHelperContent = new DefaultTagHelperContent(); - tagHelperContent.AppendEncoded(tagHelperOutputContent.OriginalChildContent); + tagHelperContent.AppendHtml(tagHelperOutputContent.OriginalChildContent); return Task.FromResult(tagHelperContent); }); - output.PreContent.AppendEncoded(expectedPreContent); - output.PostContent.AppendEncoded(expectedPostContent); + output.PreContent.AppendHtml(expectedPreContent); + output.PostContent.AppendHtml(expectedPostContent); // LabelTagHelper checks IsContentModified so we don't want to forcibly set it if // tagHelperOutputContent.OriginalContent is going to be null or empty. if (!string.IsNullOrEmpty(tagHelperOutputContent.OriginalContent)) { - output.Content.AppendEncoded(tagHelperOutputContent.OriginalContent); + output.Content.AppendHtml(tagHelperOutputContent.OriginalContent); } var viewContext = TestableHtmlGenerator.GetViewContext(model, htmlGenerator, metadataProvider); diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/SelectTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/SelectTagHelperTest.cs index f2eac768ee..03b8c9e15d 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/SelectTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/SelectTagHelperTest.cs @@ -299,15 +299,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers getChildContentAsync: useCachedResult => { var tagHelperContent = new DefaultTagHelperContent(); - tagHelperContent.AppendEncoded("Something"); + tagHelperContent.AppendHtml("Something"); return Task.FromResult(tagHelperContent); }) { TagMode = TagMode.SelfClosing, }; - output.PreContent.AppendEncoded(expectedPreContent); - output.Content.AppendEncoded(expectedContent); - output.PostContent.AppendEncoded(originalPostContent); + output.PreContent.AppendHtml(expectedPreContent); + output.Content.AppendHtml(expectedContent); + output.PostContent.AppendHtml(originalPostContent); var htmlGenerator = new TestableHtmlGenerator(metadataProvider) { @@ -403,15 +403,15 @@ namespace Microsoft.AspNet.Mvc.TagHelpers getChildContentAsync: useCachedResult => { var tagHelperContent = new DefaultTagHelperContent(); - tagHelperContent.AppendEncoded("Something"); + tagHelperContent.AppendHtml("Something"); return Task.FromResult(tagHelperContent); }) { TagMode = TagMode.SelfClosing, }; - output.PreContent.AppendEncoded(expectedPreContent); - output.Content.AppendEncoded(expectedContent); - output.PostContent.AppendEncoded(originalPostContent); + output.PreContent.AppendHtml(expectedPreContent); + output.Content.AppendHtml(expectedContent); + output.PostContent.AppendHtml(originalPostContent); var htmlGenerator = new TestableHtmlGenerator(metadataProvider) { diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs index 11451665b5..2762cbe930 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs @@ -146,7 +146,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { // Arrange var tagBuilder = new TagBuilder("span2"); - tagBuilder.InnerHtml.SetContentEncoded("New HTML"); + tagBuilder.InnerHtml.SetHtmlContent("New HTML"); tagBuilder.Attributes.Add("data-foo", "bar"); tagBuilder.Attributes.Add("data-hello", "world"); @@ -170,10 +170,10 @@ namespace Microsoft.AspNet.Mvc.TagHelpers getChildContentAsync: useCachedResult => { var tagHelperContent = new DefaultTagHelperContent(); - tagHelperContent.AppendEncoded(childContent); + tagHelperContent.AppendHtml(childContent); return Task.FromResult(tagHelperContent); }); - output.Content.AppendEncoded(outputContent); + output.Content.AppendHtml(outputContent); var context = new TagHelperContext( allAttributes: new ReadOnlyTagHelperAttributeList( @@ -205,7 +205,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { // Arrange var tagBuilder = new TagBuilder("span2"); - tagBuilder.InnerHtml.SetContentEncoded("New HTML"); + tagBuilder.InnerHtml.SetHtmlContent("New HTML"); tagBuilder.Attributes.Add("data-foo", "bar"); tagBuilder.Attributes.Add("data-hello", "world"); diff --git a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs index 388f6d6ad0..4c0941dae7 100644 --- a/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs +++ b/test/Microsoft.AspNet.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs @@ -140,7 +140,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { // Arrange var tagBuilder = new TagBuilder("span2"); - tagBuilder.InnerHtml.SetContentEncoded("New HTML"); + tagBuilder.InnerHtml.SetHtmlContent("New HTML"); tagBuilder.Attributes.Add("data-foo", "bar"); tagBuilder.Attributes.Add("data-hello", "world"); tagBuilder.Attributes.Add("anything", "something"); @@ -245,7 +245,7 @@ namespace Microsoft.AspNet.Mvc.TagHelpers { // Arrange var tagBuilder = new TagBuilder("span2"); - tagBuilder.InnerHtml.SetContentEncoded("New HTML"); + tagBuilder.InnerHtml.SetHtmlContent("New HTML"); var generator = new Mock(); generator diff --git a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs index e0786dc541..db4448f305 100644 --- a/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs +++ b/test/Microsoft.AspNet.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs @@ -110,7 +110,7 @@ namespace Microsoft.AspNet.Mvc.Core.Rendering { // Arrange var tagBuilder = new TagBuilder("p"); - tagBuilder.InnerHtml.AppendEncoded("Hello"); + tagBuilder.InnerHtml.AppendHtml("Hello"); tagBuilder.InnerHtml.Append(", World!"); // Act diff --git a/test/WebSites/ActivatorWebSite/TagHelpers/FooterTagHelper.cs b/test/WebSites/ActivatorWebSite/TagHelpers/FooterTagHelper.cs index 0fdab908a9..97fac25fb5 100644 --- a/test/WebSites/ActivatorWebSite/TagHelpers/FooterTagHelper.cs +++ b/test/WebSites/ActivatorWebSite/TagHelpers/FooterTagHelper.cs @@ -17,9 +17,9 @@ namespace ActivatorWebSite.TagHelpers public override void Process(TagHelperContext context, TagHelperOutput output) { output.PostContent - .AppendEncoded("
") + .AppendHtml("
") .Append((string)ViewContext.ViewData["footer"]) - .AppendEncoded("
"); + .AppendHtml("
"); } } } \ No newline at end of file diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/AutoLinkerTagHelper.cs b/test/WebSites/TagHelpersWebSite/TagHelpers/AutoLinkerTagHelper.cs index fba324cfb9..36a1e2c45d 100644 --- a/test/WebSites/TagHelpersWebSite/TagHelpers/AutoLinkerTagHelper.cs +++ b/test/WebSites/TagHelpersWebSite/TagHelpers/AutoLinkerTagHelper.cs @@ -15,7 +15,7 @@ namespace TagHelpersWebSite.TagHelpers var childContent = await output.GetChildContentAsync(); // Find Urls in the content and replace them with their anchor tag equivalent. - output.Content.AppendEncoded(Regex.Replace( + output.Content.AppendHtml(Regex.Replace( childContent.GetContent(), @"\b(?:https?://|www\.)(\S+)\b", "$0")); diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/BoldTagHelper.cs b/test/WebSites/TagHelpersWebSite/TagHelpers/BoldTagHelper.cs index 4d5b0a41d3..e91c74c1f4 100644 --- a/test/WebSites/TagHelpersWebSite/TagHelpers/BoldTagHelper.cs +++ b/test/WebSites/TagHelpersWebSite/TagHelpers/BoldTagHelper.cs @@ -19,8 +19,8 @@ namespace TagHelpersWebSite.TagHelpers public override void Process(TagHelperContext context, TagHelperOutput output) { output.Attributes.RemoveAll("bold"); - output.PreContent.AppendEncoded(""); - output.PostContent.AppendEncoded(""); + output.PreContent.AppendHtml(""); + output.PostContent.AppendHtml(""); } } } diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/NestedViewImportsTagHelper.cs b/test/WebSites/TagHelpersWebSite/TagHelpers/NestedViewImportsTagHelper.cs index 3281e09629..797da530dc 100644 --- a/test/WebSites/TagHelpersWebSite/TagHelpers/NestedViewImportsTagHelper.cs +++ b/test/WebSites/TagHelpersWebSite/TagHelpers/NestedViewImportsTagHelper.cs @@ -10,7 +10,7 @@ namespace TagHelpersWebSite.TagHelpers { public override void Process(TagHelperContext context, TagHelperOutput output) { - output.Content.AppendEncoded("nested-content"); + output.Content.AppendHtml("nested-content"); } } } \ No newline at end of file diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/RootViewStartTagHelper.cs b/test/WebSites/TagHelpersWebSite/TagHelpers/RootViewStartTagHelper.cs index e9c9b2070e..61d09d3316 100644 --- a/test/WebSites/TagHelpersWebSite/TagHelpers/RootViewStartTagHelper.cs +++ b/test/WebSites/TagHelpersWebSite/TagHelpers/RootViewStartTagHelper.cs @@ -10,7 +10,7 @@ namespace TagHelpersWebSite.TagHelpers { public override void Process(TagHelperContext context, TagHelperOutput output) { - output.Content.AppendEncoded("root-content"); + output.Content.AppendHtml("root-content"); } } } \ No newline at end of file diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/SurroundTagHelper.cs b/test/WebSites/TagHelpersWebSite/TagHelpers/SurroundTagHelper.cs index 61c47800cf..8bec422b5f 100644 --- a/test/WebSites/TagHelpersWebSite/TagHelpers/SurroundTagHelper.cs +++ b/test/WebSites/TagHelpersWebSite/TagHelpers/SurroundTagHelper.cs @@ -23,8 +23,8 @@ namespace TagHelpersWebSite.TagHelpers { var surroundingTagName = Surround.ToLowerInvariant(); - output.PreElement.AppendEncoded($"<{surroundingTagName}>"); - output.PostElement.AppendEncoded($""); + output.PreElement.AppendHtml($"<{surroundingTagName}>"); + output.PostElement.AppendHtml($""); } } } \ No newline at end of file diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs b/test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs index c41aca36a5..6b922a9dcd 100644 --- a/test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs +++ b/test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs @@ -56,7 +56,7 @@ namespace MvcSample.Web.Components writer)); output.TagName = null; - output.Content.AppendEncoded(writer.ToString()); + output.Content.AppendHtml(writer.ToString()); } public async Task InvokeAsync(int count) diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs b/test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs index 15d01b76f2..b18dfc797d 100644 --- a/test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs +++ b/test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs @@ -14,7 +14,7 @@ namespace TagHelpersWebSite.TagHelpers public override void Process(TagHelperContext context, TagHelperOutput output) { output.TagName = "section"; - output.PostContent.AppendEncoded(string.Format( + output.PostContent.AppendHtml(string.Format( "

Version: {0}

" + Environment.NewLine + "

Copyright Year: {1}

" + Environment.NewLine + "

Approved: {2}

" + Environment.NewLine +