Compiler: Rework IntermediateToken and LazyIntermediateToken

src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version1_X/test/ModelExpressionPassTest.cs

@@ -51,8 +51,7 @@ public void ModelExpressionPass_NonModelExpressionProperty_Ignored()
         var tagHelperNode = documentNode.GetTagHelperNode();
         var setProperty = tagHelperNode.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
 
-        var token = Assert.IsAssignableFrom<IntermediateToken>(Assert.Single(setProperty.Children));
-        Assert.True(token.IsCSharp);
+        var token = Assert.IsAssignableFrom<CSharpIntermediateToken>(Assert.Single(setProperty.Children));
         Assert.Equal("17", token.Content);
     }
 
@@ -86,8 +85,7 @@ public void ModelExpressionPass_ModelExpressionProperty_SimpleExpression()
         var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
         Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Bar)", expression.GetCSharpContent());
 
-        var originalNode = Assert.IsAssignableFrom<IntermediateToken>(expression.Children[2]);
-        Assert.Equal(TokenKind.CSharp, originalNode.Kind);
+        var originalNode = Assert.IsAssignableFrom<CSharpIntermediateToken>(expression.Children[2]);
         Assert.Equal("Bar", originalNode.Content);
         var source = Assert.NotNull(originalNode.Source);
         Assert.Equal(new SourceSpan("test.cshtml", 51, 1, 8, 3), source);
@@ -123,8 +121,7 @@ public void ModelExpressionPass_ModelExpressionProperty_ComplexExpression()
         var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
         Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => Bar)", expression.GetCSharpContent());
 
-        var originalNode = Assert.IsAssignableFrom<IntermediateToken>(expression.Children[1]);
-        Assert.Equal(TokenKind.CSharp, originalNode.Kind);
+        var originalNode = Assert.IsAssignableFrom<CSharpIntermediateToken>(expression.Children[1]);
         Assert.Equal("Bar", originalNode.Content);
         var source = Assert.NotNull(originalNode.Source);
         Assert.Equal(new SourceSpan("test.cshtml", 52, 1, 9, 3), source);

src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/AssemblyAttributeInjectionPassTest.cs

@@ -207,8 +207,7 @@ public void Execute_AddsRazorViewAttribute_ToViews()
             node =>
             {
                 var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
-                var token = Assert.IsAssignableFrom<IntermediateToken>(Assert.Single(csharpCode.Children));
-                Assert.Equal(TokenKind.CSharp, token.Kind);
+                var token = Assert.IsAssignableFrom<CSharpIntermediateToken>(Assert.Single(csharpCode.Children));
                 Assert.Equal(expectedAttribute, token.Content);
             },
             node => Assert.Same(@namespace, node));
@@ -255,8 +254,7 @@ public void Execute_EscapesViewPathWhenAddingAttributeToViews()
             node =>
             {
                 var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
-                var token = Assert.IsAssignableFrom<IntermediateToken>(Assert.Single(csharpCode.Children));
-                Assert.Equal(TokenKind.CSharp, token.Kind);
+                var token = Assert.IsAssignableFrom<CSharpIntermediateToken>(Assert.Single(csharpCode.Children));
                 Assert.Equal(expectedAttribute, token.Content);
             },
             node => Assert.Same(@namespace, node));
@@ -311,8 +309,7 @@ public void Execute_AddsRazorPagettribute_ToPage()
             node =>
             {
                 var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
-                var token = Assert.IsAssignableFrom<IntermediateToken>(Assert.Single(csharpCode.Children));
-                Assert.Equal(TokenKind.CSharp, token.Kind);
+                var token = Assert.IsAssignableFrom<CSharpIntermediateToken>(Assert.Single(csharpCode.Children));
                 Assert.Equal(expectedAttribute, token.Content);
             },
             node => Assert.Same(@namespace, node));
@@ -358,8 +355,7 @@ public void Execute_EscapesViewPathAndRouteWhenAddingAttributeToPage()
             node =>
             {
                 var csharpCode = Assert.IsType<CSharpCodeIntermediateNode>(node);
-                var token = Assert.IsAssignableFrom<IntermediateToken>(Assert.Single(csharpCode.Children));
-                Assert.Equal(TokenKind.CSharp, token.Kind);
+                var token = Assert.IsAssignableFrom<CSharpIntermediateToken>(Assert.Single(csharpCode.Children));
                 Assert.Equal(expectedAttribute, token.Content);
             },
             node => Assert.Same(@namespace, node));

src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/InstrumentationPassTest.cs

@@ -23,11 +23,7 @@ public void InstrumentationPass_NoOps_ForDesignTime()
 
         builder.Push(new HtmlContentIntermediateNode());
 
-        builder.Add(new IntermediateToken()
-        {
-            Content = "Hi",
-            Kind = TokenKind.Html
-        });
+        builder.Add(IntermediateNodeFactory.HtmlToken("Hi"));
 
         builder.Pop();
 
@@ -54,12 +50,7 @@ public void InstrumentationPass_InstrumentsHtml()
             Source = CreateSource(1),
         });
 
-        builder.Add(new IntermediateToken()
-        {
-            Content = "Hi",
-            Kind = TokenKind.Html,
-            Source = CreateSource(1)
-        });
+        builder.Add(IntermediateNodeFactory.HtmlToken("Hi", CreateSource(1)));
 
         builder.Pop();
 
@@ -85,11 +76,7 @@ public void InstrumentationPass_SkipsHtml_WithoutLocation()
 
         builder.Push(new HtmlContentIntermediateNode());
 
-        builder.Add(new IntermediateToken()
-        {
-            Content = "Hi",
-            Kind = TokenKind.Html
-        });
+        builder.Add(IntermediateNodeFactory.HtmlToken("Hi"));
 
         builder.Pop();
 
@@ -116,11 +103,7 @@ public void InstrumentationPass_InstrumentsCSharpExpression()
             Source = CreateSource(2),
         });
 
-        builder.Add(new IntermediateToken()
-        {
-            Content = "Hi",
-            Kind = TokenKind.CSharp
-        });
+        builder.Add(IntermediateNodeFactory.CSharpToken("Hi"));
 
         // Act
         ProjectEngine.ExecutePass<InstrumentationPass>(codeDocument, documentNode);
@@ -144,11 +127,7 @@ public void InstrumentationPass_SkipsCSharpExpression_WithoutLocation()
 
         builder.Push(new CSharpExpressionIntermediateNode());
 
-        builder.Add(new IntermediateToken()
-        {
-            Content = "Hi",
-            Kind = TokenKind.CSharp
-        });
+        builder.Add(IntermediateNodeFactory.CSharpToken("Hi"));
 
         // Act
         ProjectEngine.ExecutePass<InstrumentationPass>(codeDocument, documentNode);
@@ -177,11 +156,7 @@ public void InstrumentationPass_SkipsCSharpExpression_InsideTagHelperAttribute()
             Source = CreateSource(5)
         });
 
-        builder.Add(new IntermediateToken()
-        {
-            Content = "Hi",
-            Kind = TokenKind.CSharp
-        });
+        builder.Add(IntermediateNodeFactory.CSharpToken("Hi"));
 
         // Act
         ProjectEngine.ExecutePass<InstrumentationPass>(codeDocument, documentNode);
@@ -222,11 +197,7 @@ public void InstrumentationPass_SkipsCSharpExpression_InsideTagHelperProperty()
             Source = CreateSource(5)
         });
 
-        builder.Add(new IntermediateToken()
-        {
-            Content = "Hi",
-            Kind = TokenKind.CSharp
-        });
+        builder.Add(IntermediateNodeFactory.CSharpToken("Hi"));
 
         // Act
         ProjectEngine.ExecutePass<InstrumentationPass>(codeDocument, documentNode);

src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions.Version2_X/test/ModelExpressionPassTest.cs

@@ -50,8 +50,7 @@ public void ModelExpressionPass_NonModelExpressionProperty_Ignored()
         var tagHelperNode = documentNode.GetTagHelperNode();
         var setProperty = tagHelperNode.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
 
-        var token = Assert.IsAssignableFrom<IntermediateToken>(Assert.Single(setProperty.Children));
-        Assert.True(token.IsCSharp);
+        var token = Assert.IsAssignableFrom<CSharpIntermediateToken>(Assert.Single(setProperty.Children));
         Assert.Equal("17", token.Content);
     }
 
@@ -85,8 +84,7 @@ public void ModelExpressionPass_ModelExpressionProperty_SimpleExpression()
         var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
         Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Bar)", expression.GetCSharpContent());
 
-        var originalNode = Assert.IsAssignableFrom<IntermediateToken>(expression.Children[2]);
-        Assert.Equal(TokenKind.CSharp, originalNode.Kind);
+        var originalNode = Assert.IsAssignableFrom<CSharpIntermediateToken>(expression.Children[2]);
         Assert.Equal("Bar", originalNode.Content);
         var source = Assert.NotNull(originalNode.Source);
         Assert.Equal(new SourceSpan("test.cshtml", 51, 1, 8, 3), source);
@@ -122,8 +120,7 @@ public void ModelExpressionPass_ModelExpressionProperty_ComplexExpression()
         var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
         Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => Bar)", expression.GetCSharpContent());
 
-        var originalNode = Assert.IsAssignableFrom<IntermediateToken>(expression.Children[1]);
-        Assert.Equal(TokenKind.CSharp, originalNode.Kind);
+        var originalNode = Assert.IsAssignableFrom<CSharpIntermediateToken>(expression.Children[1]);
         Assert.Equal("Bar", originalNode.Content);
         var source = Assert.NotNull(originalNode.Source);
         Assert.Equal(new SourceSpan("test.cshtml", 52, 1, 9, 3), source);

src/Compiler/Microsoft.AspNetCore.Mvc.Razor.Extensions/test/ModelExpressionPassTest.cs

@@ -50,8 +50,7 @@ public void ModelExpressionPass_NonModelExpressionProperty_Ignored()
         var tagHelperNode = documentNode.GetTagHelperNode();
         var setProperty = tagHelperNode.Children.OfType<TagHelperPropertyIntermediateNode>().Single();
 
-        var token = Assert.IsAssignableFrom<IntermediateToken>(Assert.Single(setProperty.Children));
-        Assert.True(token.IsCSharp);
+        var token = Assert.IsAssignableFrom<CSharpIntermediateToken>(Assert.Single(setProperty.Children));
         Assert.Equal("17", token.Content);
     }
 
@@ -85,8 +84,7 @@ public void ModelExpressionPass_ModelExpressionProperty_SimpleExpression()
         var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
         Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => __model.Bar)", expression.GetCSharpContent());
 
-        var originalNode = Assert.IsAssignableFrom<IntermediateToken>(expression.Children[2]);
-        Assert.Equal(TokenKind.CSharp, originalNode.Kind);
+        var originalNode = Assert.IsAssignableFrom<CSharpIntermediateToken>(expression.Children[2]);
         Assert.Equal("Bar", originalNode.Content);
         var source = Assert.NotNull(originalNode.Source);
         Assert.Equal(new SourceSpan("test.cshtml", 51, 1, 8, 3), source);
@@ -122,8 +120,7 @@ public void ModelExpressionPass_ModelExpressionProperty_ComplexExpression()
         var expression = Assert.IsType<CSharpExpressionIntermediateNode>(Assert.Single(setProperty.Children));
         Assert.Equal("ModelExpressionProvider.CreateModelExpression(ViewData, __model => Bar)", expression.GetCSharpContent());
 
-        var originalNode = Assert.IsAssignableFrom<IntermediateToken>(expression.Children[1]);
-        Assert.Equal(TokenKind.CSharp, originalNode.Kind);
+        var originalNode = Assert.IsAssignableFrom<CSharpIntermediateToken>(expression.Children[1]);
         Assert.Equal("Bar", originalNode.Content);
         var source = Assert.NotNull(originalNode.Source);
         Assert.Equal(new SourceSpan("test.cshtml", 52, 1, 9, 3), source);

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DefaultDocumentWriterTest.cs

@@ -1,9 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-#nullable disable
-
-using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Test.Utilities;
@@ -175,18 +172,14 @@ public void WriteDocument_WritesClass()
         var builder = IntermediateNodeBuilder.Create(document);
         builder.Add(new ClassDeclarationIntermediateNode()
         {
-            Modifiers =
-            {
-                "internal"
-            },
+            Modifiers = { "internal" },
             BaseType = new BaseTypeWithModel("TestBase"),
-            Interfaces = [IntermediateToken.CreateCSharpToken("IFoo"), IntermediateToken.CreateCSharpToken("IBar")],
-            TypeParameters = new List<TypeParameter>
-            {
-                new TypeParameter() { ParameterName = "TKey", },
-                new TypeParameter() { ParameterName = "TValue", },
-            },
-            ClassName = "TestClass",
+            Interfaces = [IntermediateNodeFactory.CSharpToken("IFoo"), IntermediateNodeFactory. CSharpToken("IBar")],
+            TypeParameters = [
+                new TypeParameter() { ParameterName = "TKey" },
+                new TypeParameter() { ParameterName = "TValue" },
+            ],
+            ClassName = "TestClass"
         });
 
         var codeDocument = TestRazorCodeDocument.CreateEmpty();
@@ -222,19 +215,15 @@ public void WriteDocument_WithNullableContext_WritesClass()
         var builder = IntermediateNodeBuilder.Create(document);
         builder.Add(new ClassDeclarationIntermediateNode()
         {
-            Modifiers =
-            {
-                "internal"
-            },
+            Modifiers = { "internal" },
             BaseType = new BaseTypeWithModel("TestBase"),
-            Interfaces = [IntermediateToken.CreateCSharpToken("IFoo"), IntermediateToken.CreateCSharpToken("IBar")],
-            TypeParameters = new List<TypeParameter>
-            {
-                new TypeParameter() { ParameterName = "TKey", },
-                new TypeParameter() { ParameterName = "TValue", },
-            },
+            Interfaces = [IntermediateNodeFactory.CSharpToken("IFoo"), IntermediateNodeFactory.CSharpToken("IBar")],
+            TypeParameters = [
+                new TypeParameter() { ParameterName = "TKey" },
+                new TypeParameter() { ParameterName = "TValue" },
+            ],
             ClassName = "TestClass",
-            NullableContext = true,
+            NullableContext = true
         });
 
         var codeDocument = TestRazorCodeDocument.CreateEmpty();
@@ -272,18 +261,14 @@ public void WriteDocument_WritesClass_ConstrainedGenericTypeParameters()
         var builder = IntermediateNodeBuilder.Create(document);
         builder.Add(new ClassDeclarationIntermediateNode()
         {
-            Modifiers =
-                {
-                    "internal"
-                },
+            Modifiers = { "internal" },
             BaseType = new BaseTypeWithModel("TestBase"),
-            Interfaces = [IntermediateToken.CreateCSharpToken("IFoo"), IntermediateToken.CreateCSharpToken("IBar")],
-            TypeParameters = new List<TypeParameter>
-                {
-                    new TypeParameter() { ParameterName = "TKey", Constraints = "where TKey : class" },
-                    new TypeParameter() { ParameterName = "TValue", Constraints = "where TValue : class" },
-                },
-            ClassName = "TestClass",
+            Interfaces = [IntermediateNodeFactory.CSharpToken("IFoo"), IntermediateNodeFactory.CSharpToken("IBar")],
+            TypeParameters = [
+                new TypeParameter() { ParameterName = "TKey", Constraints = "where TKey : class" },
+                new TypeParameter() { ParameterName = "TValue", Constraints = "where TValue : class" },
+            ],
+            ClassName = "TestClass"
         });
 
         var codeDocument = TestRazorCodeDocument.CreateEmpty();
@@ -321,32 +306,23 @@ public void WriteDocument_WritesMethod()
         var builder = IntermediateNodeBuilder.Create(document);
         builder.Add(new MethodDeclarationIntermediateNode()
         {
-            Modifiers =
-                {
-                    "internal",
-                    "virtual",
-                    "async",
-                },
+            Modifiers = { "internal", "virtual", "async", },
             MethodName = "TestMethod",
             Parameters =
+            {
+                new MethodParameter()
                 {
-                    new MethodParameter()
-                    {
-                        Modifiers =
-                        {
-                            "readonly",
-                            "ref",
-                        },
-                        ParameterName = "a",
-                        TypeName = "int",
-                    },
-                    new MethodParameter()
-                    {
-                        ParameterName = "b",
-                        TypeName = "string",
-                    }
+                    Modifiers = { "readonly", "ref" },
+                    ParameterName = "a",
+                    TypeName = "int"
                 },
-            ReturnType = "string",
+                new MethodParameter()
+                {
+                    ParameterName = "b",
+                    TypeName = "string"
+                }
+            },
+            ReturnType = "string"
         });
 
         var codeDocument = TestRazorCodeDocument.CreateEmpty();
@@ -384,11 +360,7 @@ public void WriteDocument_WritesField()
         var builder = IntermediateNodeBuilder.Create(document);
         builder.Add(new FieldDeclarationIntermediateNode()
         {
-            Modifiers =
-                {
-                    "internal",
-                    "readonly",
-                },
+            Modifiers = { "internal", "readonly", },
             FieldName = "_foo",
             FieldType = "string",
         });
@@ -424,13 +396,9 @@ public void WriteDocument_WritesProperty()
         var builder = IntermediateNodeBuilder.Create(document);
         builder.Add(new PropertyDeclarationIntermediateNode()
         {
-            Modifiers =
-                {
-                    "internal",
-                    "virtual",
-                },
+            Modifiers = { "internal", "virtual", },
             PropertyName = "Foo",
-            PropertyType = IntermediateToken.CreateCSharpToken("string"),
+            PropertyType = IntermediateNodeFactory.CSharpToken("string"),
             PropertyExpression = "default"
         });