Don't use test hook to override formatting options in tests

And rename the parameter to match

Author: davidwengier

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/DocumentFormattingTest.cs

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Test.Common;
@@ -66,7 +65,7 @@ public void Bar() {
                     }
                 }
                 """,
-            formattingOptionsOverride: RazorCSharpSyntaxFormattingOptions.Default with
+            csharpSyntaxFormattingOptions: RazorCSharpSyntaxFormattingOptions.Default with
             {
                 NewLines = RazorNewLinePlacement.None
             });
@@ -106,7 +105,7 @@ public void Bar() {
                     }
                 }
                 """,
-            formattingOptionsOverride: RazorCSharpSyntaxFormattingOptions.Default with
+            csharpSyntaxFormattingOptions: RazorCSharpSyntaxFormattingOptions.Default with
             {
                 NewLines = RazorNewLinePlacement.None
             });
@@ -134,7 +133,7 @@ protected void ToggleIconMenu(bool iconMenuActive)
                     }
                 }
                 """,
-            formattingOptionsOverride: RazorCSharpSyntaxFormattingOptions.Default with
+            csharpSyntaxFormattingOptions: RazorCSharpSyntaxFormattingOptions.Default with
             {
                 NewLines = RazorNewLinePlacement.BeforeOpenBraceInMethods
             });
@@ -164,7 +163,7 @@ protected void ToggleIconMenu(bool iconMenuActive)
                     }
                 }
                 """,
-            formattingOptionsOverride: RazorCSharpSyntaxFormattingOptions.Default with
+            csharpSyntaxFormattingOptions: RazorCSharpSyntaxFormattingOptions.Default with
             {
                 NewLines = RazorNewLinePlacement.BeforeOpenBraceInMethods
             });
@@ -194,7 +193,7 @@ protected void ToggleIconMenu(bool iconMenuActive)
                     }
                 }
                 """,
-            formattingOptionsOverride: RazorCSharpSyntaxFormattingOptions.Default with
+            csharpSyntaxFormattingOptions: RazorCSharpSyntaxFormattingOptions.Default with
             {
                 NewLines = RazorNewLinePlacement.BeforeOpenBraceInMethods
             });
@@ -228,7 +227,7 @@ protected void ToggleIconMenu(bool iconMenuActive)
                     }
                 </div>
                 """,
-            formattingOptionsOverride: RazorCSharpSyntaxFormattingOptions.Default with
+            csharpSyntaxFormattingOptions: RazorCSharpSyntaxFormattingOptions.Default with
             {
                 NewLines = RazorNewLinePlacement.BeforeOpenBraceInMethods
             });
@@ -255,7 +254,7 @@ public string Name {
                     }
                 }
                 """,
-            formattingOptionsOverride: RazorCSharpSyntaxFormattingOptions.Default with
+            csharpSyntaxFormattingOptions: RazorCSharpSyntaxFormattingOptions.Default with
             {
                 NewLines = RazorNewLinePlacement.None
             });

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/FormattingTestBase.cs

@@ -66,13 +66,15 @@ private protected async Task RunFormattingTestAsync(
         bool codeBlockBraceOnNextLine = false,
         bool inGlobalNamespace = false,
         bool debugAssertsEnabled = true,
-        RazorCSharpSyntaxFormattingOptions? formattingOptionsOverride = null)
+        RazorCSharpSyntaxFormattingOptions? csharpSyntaxFormattingOptions = null)
     {
         (input, expected) = ProcessFormattingContext(input, expected);
 
         var razorLSPOptions = RazorLSPOptions.Default with { CodeBlockBraceOnNextLine = codeBlockBraceOnNextLine };
 
-        await RunFormattingTestInternalAsync(input, expected, tabSize, insertSpaces, fileKind, tagHelpers, allowDiagnostics, razorLSPOptions, inGlobalNamespace, debugAssertsEnabled, formattingOptionsOverride);
+        csharpSyntaxFormattingOptions ??= RazorCSharpSyntaxFormattingOptions.Default;
+
+        await RunFormattingTestInternalAsync(input, expected, tabSize, insertSpaces, fileKind, tagHelpers, allowDiagnostics, razorLSPOptions, inGlobalNamespace, debugAssertsEnabled, csharpSyntaxFormattingOptions);
     }
 
     private async Task RunFormattingTestInternalAsync(
@@ -86,7 +88,7 @@ private async Task RunFormattingTestInternalAsync(
         RazorLSPOptions? razorLSPOptions,
         bool inGlobalNamespace,
         bool debugAssertsEnabled,
-        RazorCSharpSyntaxFormattingOptions? formattingOptionsOverride)
+        RazorCSharpSyntaxFormattingOptions csharpSyntaxFormattingOptions)
     {
         // Arrange
         var fileKindValue = fileKind ?? RazorFileKind.Component;
@@ -109,11 +111,11 @@ private async Task RunFormattingTestInternalAsync(
             TabSize = tabSize,
             InsertSpaces = insertSpaces,
         };
-        var razorOptions = RazorFormattingOptions.From(options, codeBlockBraceOnNextLine: razorLSPOptions?.CodeBlockBraceOnNextLine ?? false);
+        var razorOptions = RazorFormattingOptions.From(options, codeBlockBraceOnNextLine: razorLSPOptions?.CodeBlockBraceOnNextLine ?? false, csharpSyntaxFormattingOptions);
 
         var languageServerFeatureOptions = new TestLanguageServerFeatureOptions(useNewFormattingEngine: _context.UseNewFormattingEngine);
 
-        var formattingService = await TestRazorFormattingService.CreateWithFullSupportAsync(LoggerFactory, codeDocument, razorLSPOptions, languageServerFeatureOptions, debugAssertsEnabled, formattingOptionsOverride);
+        var formattingService = await TestRazorFormattingService.CreateWithFullSupportAsync(LoggerFactory, codeDocument, razorLSPOptions, languageServerFeatureOptions, debugAssertsEnabled);
         var documentContext = new DocumentContext(uri, documentSnapshot, projectContext: null);
 
         var client = new FormattingLanguageServerClient(_htmlFormattingService, LoggerFactory);

src/Razor/test/Microsoft.AspNetCore.Razor.LanguageServer.Test/Formatting_NetFx/TestRazorFormattingService.cs

@@ -8,7 +8,6 @@
 using Microsoft.AspNetCore.Razor.LanguageServer.Hosting;
 using Microsoft.AspNetCore.Razor.Test.Common.LanguageServer;
 using Microsoft.AspNetCore.Razor.Test.Common.Workspaces;
-using Microsoft.CodeAnalysis.ExternalAccess.Razor.Features;
 using Microsoft.CodeAnalysis.Razor.Formatting;
 using Microsoft.CodeAnalysis.Razor.Logging;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
@@ -23,8 +22,7 @@ public static async Task<IRazorFormattingService> CreateWithFullSupportAsync(
         RazorCodeDocument? codeDocument = null,
         RazorLSPOptions? razorLSPOptions = null,
         LanguageServerFeatureOptions? languageServerFeatureOptions = null,
-        bool debugAssertsEnabled = false,
-        RazorCSharpSyntaxFormattingOptions? formattingOptionsOverride = null)
+        bool debugAssertsEnabled = false)
     {
         codeDocument ??= TestRazorCodeDocument.CreateEmpty();
 
@@ -50,7 +48,6 @@ public static async Task<IRazorFormattingService> CreateWithFullSupportAsync(
         var service = new RazorFormattingService(mappingService, hostServicesProvider, languageServerFeatureOptions, loggerFactory);
         var accessor = service.GetTestAccessor();
         accessor.SetDebugAssertsEnabled(debugAssertsEnabled);
-        accessor.SetCSharpSyntaxFormattingOptionsOverride(formattingOptionsOverride);
 
         return service;
     }