Make IntermediateNodeBuilder internal (#1455)

src/Microsoft.AspNetCore.Mvc.Razor.Extensions/AssemblyAttributeInjectionPass.cs

@@ -52,8 +52,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             Debug.Assert(index >= 0);
 
             var pageAttribute = new CSharpCodeIntermediateNode();
-            IntermediateNodeBuilder.Create(pageAttribute)
+            pageAttribute.Children.Add(new IntermediateToken()
-                .Add(new IntermediateToken()
             {
                 Kind = IntermediateToken.TokenKind.CSharp,
                 Content = attribute,

src/Microsoft.AspNetCore.Mvc.Razor.Extensions/InstrumentationPass.cs

@@ -31,8 +31,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             var endContextMethodName = "EndContext"; /* ORIGINAL: EndContextMethodName */
 
             var beginNode = new CSharpCodeIntermediateNode();
-            IntermediateNodeBuilder.Create(beginNode)
+            beginNode.Children.Add(new IntermediateToken()
-                .Add(new IntermediateToken()
             {
                 Kind = IntermediateToken.TokenKind.CSharp,
                 Content = string.Format("{0}({1}, {2}, {3});",
@@ -43,8 +42,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             });
 
             var endNode = new CSharpCodeIntermediateNode();
-            IntermediateNodeBuilder.Create(endNode)
+            endNode.Children.Add(new IntermediateToken()
-                .Add(new IntermediateToken()
             {
                 Kind = IntermediateToken.TokenKind.CSharp,
                 Content = string.Format("{0}();", endContextMethodName)

src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ModelExpressionPass.cs

@@ -30,9 +30,8 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
                      string.Equals(node.Descriptor.IndexerTypeName, ModelExpressionTypeName, StringComparison.Ordinal)))
                 {
                     var expression = new CSharpExpressionIntermediateNode();
-                    var builder = IntermediateNodeBuilder.Create(expression);
 
-                    builder.Add(new IntermediateToken()
+                    expression.Children.Add(new IntermediateToken()
                     {
                         Kind = IntermediateToken.TokenKind.CSharp,
                         Content = "ModelExpressionProvider.CreateModelExpression(ViewData, __model => ",
@@ -42,13 +41,13 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
                     {
                         // A 'simple' expression will look like __model => __model.Foo
 
-                        builder.Add(new IntermediateToken()
+                        expression.Children.Add(new IntermediateToken()
                         {
                             Kind = IntermediateToken.TokenKind.CSharp,
                             Content = "__model."
                         });
 
-                        builder.Add(token);
+                        expression.Children.Add(token);
                     }
                     else
                     {
@@ -61,7 +60,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
                                     if (nestedExpression.Children[j] is IntermediateToken cSharpToken &&
                                         cSharpToken.IsCSharp)
                                     {
-                                        builder.Add(cSharpToken);
+                                        expression.Children.Add(cSharpToken);
                                     }
                                 }
 
@@ -70,7 +69,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
                         }
                     }
 
-                    builder.Add(new IntermediateToken()
+                    expression.Children.Add(new IntermediateToken()
                     {
                         Kind = IntermediateToken.TokenKind.CSharp,
                         Content = ")",

src/Microsoft.AspNetCore.Mvc.Razor.Extensions/PagesPropertyInjectionPass.cs

@@ -23,8 +23,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
 
             var viewDataType = $"global::Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary<{modelType}>";
             var vddProperty = new CSharpCodeIntermediateNode();
-            IntermediateNodeBuilder.Create(vddProperty)
+            vddProperty.Children.Add(new IntermediateToken()
-                .Add(new IntermediateToken()
             {
                 Kind = IntermediateToken.TokenKind.CSharp,
                 Content = $"public {viewDataType} ViewData => ({viewDataType})PageContext?.ViewData;",
@@ -32,8 +31,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             @class.Children.Add(vddProperty);
 
             var modelProperty = new CSharpCodeIntermediateNode();
-            IntermediateNodeBuilder.Create(modelProperty)
+            modelProperty.Children.Add(new IntermediateToken()
-                .Add(new IntermediateToken()
             {
                 Kind = IntermediateToken.TokenKind.CSharp,
                 Content = $"public {modelType} Model => ViewData.Model;",

src/Microsoft.AspNetCore.Mvc.Razor.Extensions/ViewComponentTagHelperPass.cs

@@ -49,8 +49,7 @@ namespace Microsoft.AspNetCore.Mvc.Razor.Extensions
             WriteClass(writer, tagHelper);
 
             var statement = new CSharpCodeIntermediateNode();
-            IntermediateNodeBuilder.Create(statement)
+            statement.Children.Add(new IntermediateToken()
-                .Add(new IntermediateToken()
             {
                 Kind = IntermediateToken.TokenKind.CSharp,
                 Content = writer.GenerateCode()

src/Microsoft.AspNetCore.Razor.Language/Intermediate/IntermediateNodeBuilder.cs

@@ -5,7 +5,7 @@ using System;
 
 namespace Microsoft.AspNetCore.Razor.Language.Intermediate
 {
-    public abstract class IntermediateNodeBuilder
+    internal abstract class IntermediateNodeBuilder
     {
         public static IntermediateNodeBuilder Create(IntermediateNode root)
         {