RazorProjectEngine: Don't expose EngineFeatures

This property isn't necessary. Nearly every caller can be changed to go through RazorProjectEngine.Engine.GetFeatures<T>().

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

@@ -239,7 +239,7 @@ private static DocumentIntermediateNode CreateIRDocument(RazorProjectEngine proj
         // We also expect the default tag helper pass to run first.
         var documentNode = codeDocument.GetDocumentIntermediateNode();
 
-        var defaultTagHelperPass = projectEngine.EngineFeatures.OfType<DefaultTagHelperOptimizationPass>().Single();
+        var defaultTagHelperPass = projectEngine.Engine.GetFeatures<DefaultTagHelperOptimizationPass>().Single();
         defaultTagHelperPass.Execute(codeDocument, documentNode);
 
         return codeDocument.GetDocumentIntermediateNode();

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

@@ -239,7 +239,7 @@ private DocumentIntermediateNode CreateIRDocument(RazorProjectEngine projectEngi
         // We also expect the default tag helper pass to run first.
         var documentNode = codeDocument.GetDocumentIntermediateNode();
 
-        var defaultTagHelperPass = projectEngine.EngineFeatures.OfType<DefaultTagHelperOptimizationPass>().Single();
+        var defaultTagHelperPass = projectEngine.Engine.GetFeatures<DefaultTagHelperOptimizationPass>().Single();
         defaultTagHelperPass.Execute(codeDocument, documentNode);
 
         return codeDocument.GetDocumentIntermediateNode();

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

@@ -47,7 +47,7 @@ private static void AssertDefaultPhases(RazorProjectEngine engine)
 
     private static void AssertDefaultFeatures(RazorProjectEngine engine)
     {
-        var features = engine.EngineFeatures.OrderBy(f => f.GetType().Name).ToArray();
+        var features = engine.Engine.Features.OrderByAsArray(static x => x.GetType().Name);
         Assert.Collection(
             features,
             feature => Assert.IsType<AttributeDirectivePass>(feature),
@@ -96,7 +96,7 @@ private static void AssertDefaultFeatures(RazorProjectEngine engine)
 
     private static void AssertDefaultDirectives(RazorProjectEngine engine)
     {
-        var feature = engine.EngineFeatures.OfType<IRazorDirectiveFeature>().FirstOrDefault();
+        var feature = engine.Engine.GetFeatures<IRazorDirectiveFeature>().FirstOrDefault();
         Assert.NotNull(feature);
         Assert.Collection(
             feature.Directives,
@@ -109,7 +109,7 @@ private static void AssertDefaultDirectives(RazorProjectEngine engine)
 
     private static void AssertDefaultTargetExtensions(RazorProjectEngine engine)
     {
-        var feature = engine.EngineFeatures.OfType<IRazorTargetExtensionFeature>().FirstOrDefault();
+        var feature = engine.Engine.GetFeatures<IRazorTargetExtensionFeature>().FirstOrDefault();
         Assert.NotNull(feature);
 
         var extensions = feature.TargetExtensions.OrderBy(f => f.GetType().Name).ToArray();

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

@@ -1,33 +1,30 @@
 // 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;
-using System.Linq;
+using System.Collections.Immutable;
 
 namespace Microsoft.AspNetCore.Razor.Language;
 
 internal class DefaultRazorCodeGenerationOptionsFactoryProjectFeature : RazorProjectEngineFeatureBase, IRazorCodeGenerationOptionsFactoryProjectFeature
 {
-    private IConfigureRazorCodeGenerationOptionsFeature[] _configureOptions;
+    private ImmutableArray<IConfigureRazorCodeGenerationOptionsFeature> _configureOptions;
 
     protected override void OnInitialized()
     {
-        _configureOptions = ProjectEngine.EngineFeatures.OfType<IConfigureRazorCodeGenerationOptionsFeature>().ToArray();
+        _configureOptions = ProjectEngine.Engine.GetFeatures<IConfigureRazorCodeGenerationOptionsFeature>();
     }
 
     public RazorCodeGenerationOptions Create(Action<RazorCodeGenerationOptionsBuilder> configure)
     {
         var builder = new RazorCodeGenerationOptionsBuilder(ProjectEngine.Configuration);
         configure?.Invoke(builder);
 
-        for (var i = 0; i < _configureOptions.Length; i++)
+        foreach (var options in _configureOptions)
         {
-            _configureOptions[i].Configure(builder);
+            options.Configure(builder);
         }
 
-        var options = builder.Build();
-        return options;
+        return builder.Build();
     }
 }

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

@@ -1,33 +1,30 @@
 // 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;
-using System.Linq;
+using System.Collections.Immutable;
 
 namespace Microsoft.AspNetCore.Razor.Language;
 
 internal class DefaultRazorParserOptionsFactoryProjectFeature : RazorProjectEngineFeatureBase, IRazorParserOptionsFactoryProjectFeature
 {
-    private IConfigureRazorParserOptionsFeature[] _configureOptions;
+    private ImmutableArray<IConfigureRazorParserOptionsFeature> _configureOptions;
 
     protected override void OnInitialized()
     {
-        _configureOptions = ProjectEngine.EngineFeatures.OfType<IConfigureRazorParserOptionsFeature>().ToArray();
+        _configureOptions = ProjectEngine.Engine.GetFeatures<IConfigureRazorParserOptionsFeature>();
     }
 
     public RazorParserOptions Create(string fileKind, Action<RazorParserOptionsBuilder> configure)
     {
         var builder = new RazorParserOptionsBuilder(ProjectEngine.Configuration, fileKind);
         configure?.Invoke(builder);
 
-        for (var i = 0; i < _configureOptions.Length; i++)
+        foreach (var options in _configureOptions)
         {
-            _configureOptions[i].Configure(builder);
+            options.Configure(builder);
         }
 
-        var options = builder.Build();
-        return options;
+        return builder.Build();
     }
 }

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

@@ -17,7 +17,6 @@ public class RazorProjectEngine
     public RazorConfiguration Configuration { get; }
     public RazorProjectFileSystem FileSystem { get; }
     public RazorEngine Engine { get; }
-    public ImmutableArray<IRazorEngineFeature> EngineFeatures => Engine.Features;
     public ImmutableArray<IRazorEnginePhase> Phases => Engine.Phases;
     public ImmutableArray<IRazorProjectEngineFeature> ProjectFeatures { get; }
 

src/Compiler/Microsoft.CodeAnalysis.Razor/test/CompilationTagHelperFeatureTest.cs

@@ -83,7 +83,7 @@ public void GetDescriptors_DoesNotSetCompilation_IfCompilationIsInvalid()
                 configure.Features.Add(new CompilationTagHelperFeature());
             });
 
-        var feature = engine.EngineFeatures.OfType<CompilationTagHelperFeature>().First();
+        var feature = engine.Engine.GetFeatures<CompilationTagHelperFeature>().First();
 
         // Act
         var result = feature.GetDescriptors();
@@ -119,7 +119,7 @@ public void GetDescriptors_SetsCompilation_IfCompilationIsValid()
                 configure.Features.Add(new CompilationTagHelperFeature());
             });
 
-        var feature = engine.EngineFeatures.OfType<CompilationTagHelperFeature>().First();
+        var feature = engine.Engine.GetFeatures<CompilationTagHelperFeature>().First();
 
         // Act
         var result = feature.GetDescriptors();

src/Compiler/Microsoft.CodeAnalysis.Razor/test/RazorProjectEngineBuilderExtensionsTest.cs

@@ -28,7 +28,7 @@ public void SetCSharpLanguageVersion_ResolvesNonNumericCSharpLangVersions()
         });
 
         // Assert
-        var feature = projectEngine.EngineFeatures.OfType<ConfigureParserForCSharpVersionFeature>().FirstOrDefault();
+        var feature = projectEngine.Engine.GetFeatures<ConfigureParserForCSharpVersionFeature>().FirstOrDefault();
         Assert.NotNull(feature);
         Assert.NotEqual(csharpLanguageVersion, feature.CSharpLanguageVersion);
     }

src/Compiler/perf/Microbenchmarks/SyntaxTreeGenerationBenckmark.cs

@@ -30,7 +30,7 @@ public SyntaxTreeGenerationBenchmark()
         var projectItem = fileSystem.GetItem(Path.Combine(root.FullName, "MSN.cshtml"), FileKinds.Legacy);
         MSN = RazorSourceDocument.ReadFrom(projectItem);
 
-        var directiveFeature = ProjectEngine.EngineFeatures.OfType<IRazorDirectiveFeature>().FirstOrDefault();
+        var directiveFeature = ProjectEngine.Engine.GetFeatures<IRazorDirectiveFeature>().FirstOrDefault();
         Directives = directiveFeature?.Directives.ToArray() ?? Array.Empty<DirectiveDescriptor>();
     }