Allow content, output and context as keywords to VC params.

N. Taylor Mullen · N. Taylor Mullen · commit c16d55c63fc1 · 2019-06-19T11:19:16.000-07:00
- It looks that when we first did VCTH we never put in the effort to reduce our footprint on available parameters for `ViewComponentTagHelper`s. I went ahead and added several underscores to the generated fields/parameters to reduce collisions. - Updated tests to reflect the new codegen. aspnet/AspNetCoredotnet/aspnetcore-tooling#8645 \n\nCommit migrated from dotnet/razor@b545a4d
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperTargetExtension.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/src/ViewComponentTagHelperTargetExtension.cs
@@ -18,7 +18,7 @@ internal class ViewComponentTagHelperTargetExtension : IViewComponentTagHelperTa
 
         public string ViewComponentHelperTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.IViewComponentHelper";
 
-        public string ViewComponentHelperVariableName { get; set; } = "_helper";
+        public string ViewComponentHelperVariableName { get; set; } = "__helper";
 
         public string ViewComponentInvokeMethodName { get; set; } = "InvokeAsync";
 
@@ -36,19 +36,19 @@ internal class ViewComponentTagHelperTargetExtension : IViewComponentTagHelperTa
 
         public string TagHelperContextTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext";
 
-        public string TagHelperContextVariableName { get; set; } = "context";
+        public string TagHelperContextVariableName { get; set; } = "__context";
 
         public string TagHelperOutputTypeName { get; set; } = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput";
 
-        public string TagHelperOutputVariableName { get; set; } = "output";
+        public string TagHelperOutputVariableName { get; set; } = "__output";
 
         public string TagHelperOutputTagNamePropertyName { get; set; } = "TagName";
 
         public string TagHelperOutputContentPropertyName { get; set; } = "Content";
 
         public string TagHelperContentSetMethodName { get; set; } = "SetHtmlContent";
 
-        public string TagHelperContentVariableName { get; set; } = "content";
+        public string TagHelperContentVariableName { get; set; } = "__helperContent";
 
         public string IViewContextAwareTypeName { get; set; } = "global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware";
 
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_DesignTime.codegen.cs
@@ -75,20 +75,20 @@ private void __RazorDirectiveTokenHelpers__() {
         [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]
         public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
         {
-            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __helper = null;
             public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
             {
-                _helper = helper;
+                __helper = helper;
             }
             [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
             public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
             public System.String firstName { get; set; }
-            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext __context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput __output)
             {
-                (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
-                var content = await _helper.InvokeAsync("Test", new { firstName });
-                output.TagName = null;
-                output.Content.SetHtmlContent(content);
+                (__helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+                var __helperContent = await __helper.InvokeAsync("Test", new { firstName });
+                __output.TagName = null;
+                __output.Content.SetHtmlContent(__helperContent);
             }
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/TestFiles/IntegrationTests/CodeGenerationIntegrationTest/ViewComponentTagHelper_Runtime.codegen.cs
@@ -92,20 +92,20 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewCompon
         [Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]
         public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
         {
-            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+            private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __helper = null;
             public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
             {
-                _helper = helper;
+                __helper = helper;
             }
             [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
             public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
             public System.String firstName { get; set; }
-            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+            public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext __context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput __output)
             {
-                (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
-                var content = await _helper.InvokeAsync("Test", new { firstName });
-                output.TagName = null;
-                output.Content.SetHtmlContent(content);
+                (__helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+                var __helperContent = await __helper.InvokeAsync("Test", new { firstName });
+                __output.TagName = null;
+                __output.Content.SetHtmlContent(__helperContent);
             }
         }
     }
diff --git a/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperTargetExtensionTest.cs b/src/Razor/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ViewComponentTagHelperTargetExtensionTest.cs
@@ -41,20 +41,20 @@ public void WriteViewComponentTagHelper_GeneratesViewComponentTagHelper()
                 @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
 public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
 {
-    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __helper = null;
     public __Generated__TagCloudViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
     {
-        _helper = helper;
+        __helper = helper;
     }
     [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
     public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
     public System.Int32 Foo { get; set; }
-    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext __context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput __output)
     {
-        (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
-        var content = await _helper.InvokeAsync(""TagCloud"", new { Foo });
-        output.TagName = null;
-        output.Content.SetHtmlContent(content);
+        (__helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+        var __helperContent = await __helper.InvokeAsync(""TagCloud"", new { Foo });
+        __output.TagName = null;
+        __output.Content.SetHtmlContent(__helperContent);
     }
 }
 ",
@@ -95,21 +95,21 @@ public void WriteViewComponentTagHelper_GeneratesViewComponentTagHelper_WithInde
                 @"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]
 public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper
 {
-    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;
+    private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __helper = null;
     public __Generated__TagCloudViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)
     {
-        _helper = helper;
+        __helper = helper;
     }
     [Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]
     public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }
     public System.Collections.Generic.Dictionary<System.String, System.Int32> Tags { get; set; }
      = new System.Collections.Generic.Dictionary<System.String, System.Int32>();
-    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)
+    public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext __context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput __output)
     {
-        (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
-        var content = await _helper.InvokeAsync(""TagCloud"", new { Tags });
-        output.TagName = null;
-        output.Content.SetHtmlContent(content);
+        (__helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);
+        var __helperContent = await __helper.InvokeAsync(""TagCloud"", new { Tags });
+        __output.TagName = null;
+        __output.Content.SetHtmlContent(__helperContent);
     }
 }
 ",

Original file line number	Diff line number	Diff line change
`@@ -75,20 +75,20 @@ private void __RazorDirectiveTokenHelpers__() {`
`75`	`75`	`[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]`
`76`	`76`	`public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper`
`77`	`77`	`{`
`78`		`- private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;`
	`78`	`+ private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __helper = null;`
`79`	`79`	`public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)`
`80`	`80`	`{`
`81`		`- _helper = helper;`
	`81`	`+ __helper = helper;`
`82`	`82`	`}`
`83`	`83`	`[Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]`
`84`	`84`	`public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }`
`85`	`85`	`public System.String firstName { get; set; }`
`86`		`- public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)`
	`86`	`+ public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext __context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput __output)`
`87`	`87`	`{`
`88`		`- (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);`
`89`		`- var content = await _helper.InvokeAsync("Test", new { firstName });`
`90`		`- output.TagName = null;`
`91`		`- output.Content.SetHtmlContent(content);`
	`88`	`+ (__helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);`
	`89`	`+ var __helperContent = await __helper.InvokeAsync("Test", new { firstName });`
	`90`	`+ __output.TagName = null;`
	`91`	`+ __output.Content.SetHtmlContent(__helperContent);`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,20 +92,20 @@ public class TestFiles_IntegrationTests_CodeGenerationIntegrationTest_ViewCompon`
`92`	`92`	`[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute("vc:test")]`
`93`	`93`	`public class __Generated__TestViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper`
`94`	`94`	`{`
`95`		`- private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;`
	`95`	`+ private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __helper = null;`
`96`	`96`	`public __Generated__TestViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)`
`97`	`97`	`{`
`98`		`- _helper = helper;`
	`98`	`+ __helper = helper;`
`99`	`99`	`}`
`100`	`100`	`[Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]`
`101`	`101`	`public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }`
`102`	`102`	`public System.String firstName { get; set; }`
`103`		`- public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)`
	`103`	`+ public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext __context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput __output)`
`104`	`104`	`{`
`105`		`- (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);`
`106`		`- var content = await _helper.InvokeAsync("Test", new { firstName });`
`107`		`- output.TagName = null;`
`108`		`- output.Content.SetHtmlContent(content);`
	`105`	`+ (__helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);`
	`106`	`+ var __helperContent = await __helper.InvokeAsync("Test", new { firstName });`
	`107`	`+ __output.TagName = null;`
	`108`	`+ __output.Content.SetHtmlContent(__helperContent);`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,20 +41,20 @@ public void WriteViewComponentTagHelper_GeneratesViewComponentTagHelper()`
`41`	`41`	`@"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]`
`42`	`42`	`public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper`
`43`	`43`	`{`
`44`		`- private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;`
	`44`	`+ private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __helper = null;`
`45`	`45`	`public __Generated__TagCloudViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)`
`46`	`46`	`{`
`47`		`- _helper = helper;`
	`47`	`+ __helper = helper;`
`48`	`48`	`}`
`49`	`49`	`[Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]`
`50`	`50`	`public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }`
`51`	`51`	`public System.Int32 Foo { get; set; }`
`52`		`- public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)`
	`52`	`+ public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext __context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput __output)`
`53`	`53`	`{`
`54`		`- (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);`
`55`		`- var content = await _helper.InvokeAsync(""TagCloud"", new { Foo });`
`56`		`- output.TagName = null;`
`57`		`- output.Content.SetHtmlContent(content);`
	`54`	`+ (__helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);`
	`55`	`+ var __helperContent = await __helper.InvokeAsync(""TagCloud"", new { Foo });`
	`56`	`+ __output.TagName = null;`
	`57`	`+ __output.Content.SetHtmlContent(__helperContent);`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`",`
`@@ -95,21 +95,21 @@ public void WriteViewComponentTagHelper_GeneratesViewComponentTagHelper_WithInde`
`95`	`95`	`@"[Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute(""tagcloud"")]`
`96`	`96`	`public class __Generated__TagCloudViewComponentTagHelper : Microsoft.AspNetCore.Razor.TagHelpers.TagHelper`
`97`	`97`	`{`
`98`		`- private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper _helper = null;`
	`98`	`+ private readonly global::Microsoft.AspNetCore.Mvc.IViewComponentHelper __helper = null;`
`99`	`99`	`public __Generated__TagCloudViewComponentTagHelper(global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper)`
`100`	`100`	`{`
`101`		`- _helper = helper;`
	`101`	`+ __helper = helper;`
`102`	`102`	`}`
`103`	`103`	`[Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNotBoundAttribute, global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewContextAttribute]`
`104`	`104`	`public global::Microsoft.AspNetCore.Mvc.Rendering.ViewContext ViewContext { get; set; }`
`105`	`105`	`public System.Collections.Generic.Dictionary<System.String, System.Int32> Tags { get; set; }`
`106`	`106`	`= new System.Collections.Generic.Dictionary<System.String, System.Int32>();`
`107`		`- public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput output)`
	`107`	`+ public override async global::System.Threading.Tasks.Task ProcessAsync(Microsoft.AspNetCore.Razor.TagHelpers.TagHelperContext __context, Microsoft.AspNetCore.Razor.TagHelpers.TagHelperOutput __output)`
`108`	`108`	`{`
`109`		`- (_helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);`
`110`		`- var content = await _helper.InvokeAsync(""TagCloud"", new { Tags });`
`111`		`- output.TagName = null;`
`112`		`- output.Content.SetHtmlContent(content);`
	`109`	`+ (__helper as global::Microsoft.AspNetCore.Mvc.ViewFeatures.IViewContextAware)?.Contextualize(ViewContext);`
	`110`	`+ var __helperContent = await __helper.InvokeAsync(""TagCloud"", new { Tags });`
	`111`	`+ __output.TagName = null;`
	`112`	`+ __output.Content.SetHtmlContent(__helperContent);`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`	`",`