From 2800c4938af0bf096bf3c809d6e5c8f8b98d91c1 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Thu, 8 May 2014 15:27:32 -0700 Subject: [PATCH] Disable async await warnings in empty Execute method. Also removed a confusing CSharpCodeWriting method. #28 --- .../Compiler/CodeBuilder/CSharp/CSharpCodeBuilder.cs | 8 ++++++-- .../Compiler/CodeBuilder/CSharp/CSharpCodeWriter.cs | 5 ----- .../CSharp/Visitors/CSharpDesignTimeHelpersVisitor.cs | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeBuilder.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeBuilder.cs index 680a274502..ec5044425f 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeBuilder.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeBuilder.cs @@ -57,9 +57,13 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp // Add space inbetween constructor and method body writer.WriteLine(); - using (writer.BuildMethodDeclaration("public override async", "Task", Host.GeneratedClassContext.ExecuteMethodName)) + // 1998 is to not warn about empty async methods. + using (writer.BuildDisableWarningScope(1998)) { - new CSharpCodeVisitor(writer, Context).Accept(Tree.Chunks); + using (writer.BuildMethodDeclaration("public override async", "Task", Host.GeneratedClassContext.ExecuteMethodName)) + { + new CSharpCodeVisitor(writer, Context).Accept(Tree.Chunks); + } } } } diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeWriter.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeWriter.cs index 5931007cbd..9d32a19348 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeWriter.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/CSharpCodeWriter.cs @@ -226,11 +226,6 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp return WriteStartMethodInvocation(methodName).Write(string.Join(", ", parameters)).WriteEndMethodInvocation(endLine); } - public CSharpDisableWarningScope BuildDisableWarningScope() - { - return new CSharpDisableWarningScope(this, 219); - } - public CSharpDisableWarningScope BuildDisableWarningScope(int warning) { return new CSharpDisableWarningScope(this, warning); diff --git a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpDesignTimeHelpersVisitor.cs b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpDesignTimeHelpersVisitor.cs index dfcf6afe4d..a84c2672aa 100644 --- a/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpDesignTimeHelpersVisitor.cs +++ b/src/Microsoft.AspNet.Razor/Generator/Compiler/CodeBuilder/CSharp/Visitors/CSharpDesignTimeHelpersVisitor.cs @@ -17,7 +17,7 @@ namespace Microsoft.AspNet.Razor.Generator.Compiler.CSharp { using (Writer.BuildMethodDeclaration("private", "void", "@" + DesignTimeHelperMethodName)) { - using (Writer.BuildDisableWarningScope()) + using (Writer.BuildDisableWarningScope(219)) { Accept(tree.Chunks); }