From 2d2c2cdf0fb448ad8e44affe56d2156b10be0f79 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Tue, 13 Jan 2015 14:40:55 -0800 Subject: [PATCH] Add warning disable for unused variable warnings for TagHelper fields. - Added a 0414 warning disable/restore around the __tagHelperStringValueBuffer since it's the only TagHelper utility field that "may" never be used. - Regenerated baselines for TagHelper test files. #260 --- .../CSharp/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs | 4 ++++ .../CS/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs | 2 ++ .../TestFiles/CodeGenerator/CS/Output/BasicTagHelpers.cs | 2 ++ .../TestFiles/CodeGenerator/CS/Output/ComplexTagHelpers.cs | 2 ++ .../CodeGenerator/CS/Output/ContentBehaviorTagHelpers.cs | 2 ++ .../TestFiles/CodeGenerator/CS/Output/SingleTagHelper.cs | 2 ++ .../TestFiles/CodeGenerator/CS/Output/TagHelpersInHelper.cs | 2 ++ .../TestFiles/CodeGenerator/CS/Output/TagHelpersInSection.cs | 2 ++ 8 files changed, 18 insertions(+) diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs index 01e5095223..ba9532f264 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs @@ -34,9 +34,13 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp // Runtime fields aren't useful during design time. if (!Context.Host.DesignTimeMode) { + // Need to disable the warning "X is assigned to but never used." for the value buffer since + // whether it's used depends on how a TagHelper is used. + Writer.WritePragma("warning disable 0414"); WritePrivateField(typeof(TextWriter).FullName, CSharpTagHelperCodeRenderer.StringValueBufferVariableName, value: null); + Writer.WritePragma("warning restore 0414"); WritePrivateField(_tagHelperContext.ExecutionContextTypeName, CSharpTagHelperCodeRenderer.ExecutionContextVariableName, diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs index 634adf8743..9480b4d550 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs @@ -7,7 +7,9 @@ namespace TestOutput public class BasicTagHelpers { #line hidden + #pragma warning disable 0414 private System.IO.TextWriter __tagHelperStringValueBuffer = null; + #pragma warning restore 0414 private TagHelperExecutionContext __tagHelperExecutionContext = null; private TagHelperRunner __tagHelperRunner = new TagHelperRunner(); private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/BasicTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/BasicTagHelpers.cs index 89500bba9b..23c8d1cc14 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/BasicTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/BasicTagHelpers.cs @@ -8,7 +8,9 @@ namespace TestOutput public class BasicTagHelpers { #line hidden + #pragma warning disable 0414 private System.IO.TextWriter __tagHelperStringValueBuffer = null; + #pragma warning restore 0414 private TagHelperExecutionContext __tagHelperExecutionContext = null; private TagHelperRunner __tagHelperRunner = new TagHelperRunner(); private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ComplexTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ComplexTagHelpers.cs index c4117e622c..3b4087d2f4 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ComplexTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ComplexTagHelpers.cs @@ -8,7 +8,9 @@ namespace TestOutput public class ComplexTagHelpers { #line hidden + #pragma warning disable 0414 private System.IO.TextWriter __tagHelperStringValueBuffer = null; + #pragma warning restore 0414 private TagHelperExecutionContext __tagHelperExecutionContext = null; private TagHelperRunner __tagHelperRunner = new TagHelperRunner(); private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ContentBehaviorTagHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ContentBehaviorTagHelpers.cs index 3f1aca0d30..7ba7fbf929 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ContentBehaviorTagHelpers.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/ContentBehaviorTagHelpers.cs @@ -8,7 +8,9 @@ namespace TestOutput public class ContentBehaviorTagHelpers { #line hidden + #pragma warning disable 0414 private System.IO.TextWriter __tagHelperStringValueBuffer = null; + #pragma warning restore 0414 private TagHelperExecutionContext __tagHelperExecutionContext = null; private TagHelperRunner __tagHelperRunner = new TagHelperRunner(); private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/SingleTagHelper.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/SingleTagHelper.cs index 6ef6fc9c24..bf355d24bb 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/SingleTagHelper.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/SingleTagHelper.cs @@ -8,7 +8,9 @@ namespace TestOutput public class SingleTagHelper { #line hidden + #pragma warning disable 0414 private System.IO.TextWriter __tagHelperStringValueBuffer = null; + #pragma warning restore 0414 private TagHelperExecutionContext __tagHelperExecutionContext = null; private TagHelperRunner __tagHelperRunner = new TagHelperRunner(); private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/TagHelpersInHelper.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/TagHelpersInHelper.cs index e42fa6429c..4f5ab8a234 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/TagHelpersInHelper.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/TagHelpersInHelper.cs @@ -89,7 +89,9 @@ Write(DateTime.Now); #line hidden #line hidden + #pragma warning disable 0414 private System.IO.TextWriter __tagHelperStringValueBuffer = null; + #pragma warning restore 0414 private TagHelperExecutionContext __tagHelperExecutionContext = null; private TagHelperRunner __tagHelperRunner = new TagHelperRunner(); private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager(); diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/TagHelpersInSection.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/TagHelpersInSection.cs index 63a915e605..3867c58b59 100644 --- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/TagHelpersInSection.cs +++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/TagHelpersInSection.cs @@ -7,7 +7,9 @@ namespace TestOutput public class TagHelpersInSection { #line hidden + #pragma warning disable 0414 private System.IO.TextWriter __tagHelperStringValueBuffer = null; + #pragma warning restore 0414 private TagHelperExecutionContext __tagHelperExecutionContext = null; private TagHelperRunner __tagHelperRunner = new TagHelperRunner(); private TagHelperScopeManager __tagHelperScopeManager = new TagHelperScopeManager();