Moved CSharpCodeWriter out of legacy

aspnet · Jun 21, 2017 · 4811807 · 4811807
1 parent 21e26ad
commit 4811807
Show file tree

Hide file tree

Showing 24 changed files with 658 additions and 942 deletions.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs b/src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs
@@ -6,8 +6,8 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
+using Microsoft.AspNetCore.Razor.Language.CodeGeneration;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
-using Microsoft.AspNetCore.Razor.Language.Legacy;
 
 namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 {
@@ -51,7 +51,7 @@ private void GenerateVCTHClass(ClassDeclarationIntermediateNode @class, TagHelpe
                 .Add(new IntermediateToken()
                 {
                     Kind = IntermediateToken.TokenKind.CSharp,
-                    Content = writer.Builder.ToString()
+                    Content = writer.GenerateCode()
                 });
 
             @class.Children.Add(statement);
@@ -101,7 +101,7 @@ private void WriteClass(CSharpCodeWriter writer, TagHelperDescriptor descriptor)
             var tagHelperTypeName = "Microsoft.AspNetCore.Razor.TagHelpers.TagHelper";
             var className = GetVCTHClassName(descriptor);
 
-            using (writer.BuildClassDeclaration("public", className, new[] { tagHelperTypeName }))
+            using (writer.BuildClassDeclaration("public", className, tagHelperTypeName, interfaces: null))
             {
                 // Add view component helper.
                 writer.WriteVariableDeclaration(
@@ -122,11 +122,12 @@ private void WriteClass(CSharpCodeWriter writer, TagHelperDescriptor descriptor)
 
         private void BuildConstructorString(CSharpCodeWriter writer, string className)
         {
-            var helperPair = new KeyValuePair<string, string>(
-                $"global::Microsoft.AspNetCore.Mvc.IViewComponentHelper",
-                "helper");
-
-            using (writer.BuildConstructor("public", className, new[] { helperPair }))
+            writer.Write("public ")
+                .Write(className)
+                .Write("(")
+                .Write("global::Microsoft.AspNetCore.Mvc.IViewComponentHelper helper")
+                .WriteLine(")");
+            using (writer.BuildScope())
             {
                 writer.WriteStartAssignment("_helper")
                     .Write("helper")