Fix DefaultRazorParsingPhaseTest

Because RazorCodeDocument now owns its ParserOptions and CodeGenerationOptions, it is generally important to create a RazorCodeDocument by calling RazorProjectEngine.CreateCodeDocument(...) in order to configure the options correctly.

Author: DustinCampbell

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorParsingPhaseTest.cs

@@ -13,13 +13,14 @@ public void Execute_AddsSyntaxTree()
     {
         // Arrange
         var phase = new DefaultRazorParsingPhase();
-        var engine = RazorProjectEngine.CreateEmpty(builder =>
+
+        var projectEngine = RazorProjectEngine.CreateEmpty(builder =>
         {
             builder.Phases.Add(phase);
             builder.Features.Add(new DefaultRazorParserOptionsFeature());
         });
 
-        var codeDocument = TestRazorCodeDocument.CreateEmpty();
+        var codeDocument = projectEngine.CreateEmptyCodeDocument();
 
         // Act
         phase.Execute(codeDocument);
@@ -33,14 +34,15 @@ public void Execute_UsesConfigureParserFeatures()
     {
         // Arrange
         var phase = new DefaultRazorParsingPhase();
-        var engine = RazorProjectEngine.CreateEmpty((builder) =>
+
+        var projectEngine = RazorProjectEngine.CreateEmpty((builder) =>
         {
             builder.Phases.Add(phase);
             builder.Features.Add(new DefaultRazorParserOptionsFeature());
-            builder.ConfigureParserOptions(ConfigureDirective);
+            builder.AddDirective(CreateDirective());
         });
 
-        var codeDocument = TestRazorCodeDocument.CreateEmpty();
+        var codeDocument = projectEngine.CreateEmptyCodeDocument();
 
         // Act
         phase.Execute(codeDocument);
@@ -56,20 +58,20 @@ public void Execute_ParsesImports()
     {
         // Arrange
         var phase = new DefaultRazorParsingPhase();
-        var engine = RazorProjectEngine.CreateEmpty((builder) =>
+
+        var projectEngine = RazorProjectEngine.CreateEmpty(builder =>
         {
             builder.Phases.Add(phase);
             builder.Features.Add(new DefaultRazorParserOptionsFeature());
-            builder.ConfigureParserOptions(ConfigureDirective);
+            builder.AddDirective(CreateDirective());
         });
 
-        var sourceDocument = TestRazorSourceDocument.Create();
-
-        var imports = ImmutableArray.Create(
+        var source = TestRazorSourceDocument.Create();
+        var importSources = ImmutableArray.Create(
             TestRazorSourceDocument.Create(),
             TestRazorSourceDocument.Create());
 
-        var codeDocument = RazorCodeDocument.Create(sourceDocument, imports: default);
+        var codeDocument = projectEngine.CreateCodeDocument(source, importSources);
 
         // Act
         phase.Execute(codeDocument);
@@ -79,12 +81,10 @@ public void Execute_ParsesImports()
         Assert.False(importSyntaxTrees.IsDefault);
         Assert.Collection(
             importSyntaxTrees,
-            t => { Assert.Same(t.Source, imports[0]); Assert.Equal("test", Assert.Single(t.Options.Directives).Directive); },
-            t => { Assert.Same(t.Source, imports[1]); Assert.Equal("test", Assert.Single(t.Options.Directives).Directive); });
+            t => { Assert.Same(t.Source, importSources[0]); Assert.Equal("test", Assert.Single(t.Options.Directives).Directive); },
+            t => { Assert.Same(t.Source, importSources[1]); Assert.Equal("test", Assert.Single(t.Options.Directives).Directive); });
     }
 
-    private static void ConfigureDirective(RazorParserOptions.Builder builder)
-    {
-        builder.Directives = [DirectiveDescriptor.CreateDirective("test", DirectiveKind.SingleLine)];
-    }
+    private static DirectiveDescriptor CreateDirective()
+        => DirectiveDescriptor.CreateDirective("test", DirectiveKind.SingleLine);
 }

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/RazorProjectEngine.cs

@@ -146,11 +146,16 @@ internal RazorCodeDocument CreateCodeDocument(RazorProjectItem projectItem, bool
             : CreateCodeDocumentCore(projectItem);
     }
 
-    internal RazorCodeDocument CreateCodeDocument(RazorSourceDocument source, string fileKind)
+    internal RazorCodeDocument CreateCodeDocument(
+        RazorSourceDocument source,
+        string fileKind,
+        ImmutableArray<RazorSourceDocument> importSources,
+        IReadOnlyList<TagHelperDescriptor>? tagHelpers,
+        string? cssScope)
     {
         ArgHelper.ThrowIfNull(source);
 
-        return CreateCodeDocumentCore(source, fileKind, importSources: default, tagHelpers: null, cssScope: null, configureParser: null, configureCodeGeneration: null);
+        return CreateCodeDocumentCore(source, fileKind, importSources, tagHelpers, cssScope, configureParser: null, configureCodeGeneration: null);
     }
 
     private RazorCodeDocument CreateCodeDocumentCore(

src/Shared/Microsoft.AspNetCore.Razor.Test.Common/Language/RazorProjectEngineExtensions.cs

@@ -0,0 +1,43 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Collections.Immutable;
+
+namespace Microsoft.AspNetCore.Razor.Language;
+
+public static class RazorProjectEngineExtensions
+{
+    private static string DefaultFileKind => FileKinds.Legacy;
+
+    public static RazorCodeDocument CreateEmptyCodeDocument(this RazorProjectEngine projectEngine)
+    {
+        var source = TestRazorSourceDocument.Create(content: string.Empty);
+
+        return projectEngine.CreateCodeDocument(source, DefaultFileKind, importSources: default);
+    }
+
+    public static RazorCodeDocument CreateCodeDocument(
+        this RazorProjectEngine projectEngine,
+        RazorSourceDocument source,
+        string fileKind)
+    {
+        return projectEngine.CreateCodeDocument(source, fileKind, importSources: default);
+    }
+
+    public static RazorCodeDocument CreateCodeDocument(
+        this RazorProjectEngine projectEngine,
+        RazorSourceDocument source,
+        ImmutableArray<RazorSourceDocument> importSources)
+    {
+        return projectEngine.CreateCodeDocument(source, fileKind: DefaultFileKind, importSources);
+    }
+
+    public static RazorCodeDocument CreateCodeDocument(
+        this RazorProjectEngine projectEngine,
+        RazorSourceDocument source,
+        string fileKind,
+        ImmutableArray<RazorSourceDocument> importSources)
+    {
+        return projectEngine.CreateCodeDocument(source, fileKind, importSources, tagHelpers: null, cssScope: null);
+    }
+}