Add failing test to ensure add using is offered first

Currently its "Extract to New Component" which is annoying, and unlikely to be correct IMO

Author: davidwengier

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CodeActions/CohostCodeActionsEndpointTestBase.cs

@@ -31,6 +31,25 @@ namespace Microsoft.VisualStudio.Razor.LanguageClient.Cohost.CodeActions;
 public abstract class CohostCodeActionsEndpointTestBase(ITestOutputHelper testOutputHelper) : CohostEndpointTestBase(testOutputHelper)
 {
     private protected async Task VerifyCodeActionAsync(TestCode input, string? expected, string codeActionName, int childActionIndex = 0, string? fileKind = null, (string filePath, string contents)[]? additionalFiles = null, (Uri fileUri, string contents)[]? additionalExpectedFiles = null)
+    {
+        var document = CreateRazorDocument(input, fileKind, additionalFiles);
+
+        var codeAction = await VerifyCodeActionRequestAsync(document, input, codeActionName, childActionIndex, expectOffer: expected is not null);
+
+        if (codeAction is null)
+        {
+            Assert.Null(expected);
+            return;
+        }
+
+        var workspaceEdit = codeAction.Data is null
+            ? codeAction.Edit.AssumeNotNull()
+            : await ResolveCodeActionAsync(document, codeAction);
+
+        await VerifyCodeActionResultAsync(document, workspaceEdit, expected, additionalExpectedFiles);
+    }
+
+    private protected TextDocument CreateRazorDocument(TestCode input, string? fileKind = null, (string filePath, string contents)[]? additionalFiles = null)
     {
         var fileSystem = (RemoteFileSystem)OOPExportProvider.GetExportedValue<IFileSystem>();
         fileSystem.GetTestAccessor().SetFileSystem(new TestFileSystem(additionalFiles));
@@ -49,23 +68,42 @@ private protected async Task VerifyCodeActionAsync(TestCode input, string? expec
         });
 
         var document = CreateProjectAndRazorDocument(input.Text, fileKind, createSeparateRemoteAndLocalWorkspaces: true, additionalFiles: additionalFiles);
+        return document;
+    }
 
-        var codeAction = await VerifyCodeActionRequestAsync(document, input, codeActionName, childActionIndex, expectOffer: expected is not null);
+    private async Task<CodeAction?> VerifyCodeActionRequestAsync(TextDocument document, TestCode input, string codeActionName, int childActionIndex, bool expectOffer)
+    {
+        var result = await GetCodeActionsAsync(document, input);
+        if (result is null)
+        {
+            return null;
+        }
 
-        if (codeAction is null)
+        var codeActionToRun = (VSInternalCodeAction?)result.SingleOrDefault(e => ((RazorVSInternalCodeAction)e.Value!).Name == codeActionName).Value;
+
+        if (!expectOffer)
         {
-            Assert.Null(expected);
-            return;
+            Assert.Null(codeActionToRun);
+            return null;
         }
 
-        var workspaceEdit = codeAction.Data is null
-            ? codeAction.Edit.AssumeNotNull()
-            : await ResolveCodeActionAsync(document, codeAction);
+        AssertEx.NotNull(codeActionToRun, $"""
+            Could not find code action with name '{codeActionName}'.
 
-        await VerifyCodeActionResultAsync(document, workspaceEdit, expected, additionalExpectedFiles);
+            Available:
+                {string.Join(Environment.NewLine + "    ", result.Select(e => ((RazorVSInternalCodeAction)e.Value!).Name))}
+            """);
+
+        if (codeActionToRun.Children?.Length > 0)
+        {
+            codeActionToRun = codeActionToRun.Children[childActionIndex];
+        }
+
+        Assert.NotNull(codeActionToRun);
+        return codeActionToRun;
     }
 
-    private async Task<CodeAction?> VerifyCodeActionRequestAsync(TextDocument document, TestCode input, string codeActionName, int childActionIndex, bool expectOffer)
+    private protected async Task<SumType<Command, CodeAction>[]?> GetCodeActionsAsync(TextDocument document, TestCode input)
     {
         var requestInvoker = new TestLSPRequestInvoker();
         var endpoint = new CohostCodeActionsEndpoint(RemoteServiceInvoker, ClientCapabilitiesService, TestHtmlDocumentSynchronizer.Instance, requestInvoker, NoOpTelemetryReporter.Instance);
@@ -107,37 +145,13 @@ private protected async Task VerifyCodeActionAsync(TestCode input, string? expec
         }
 
         var result = await endpoint.GetTestAccessor().HandleRequestAsync(document, request, DisposalToken);
-
         if (result is null)
         {
             return null;
         }
 
-        Assert.NotNull(result);
         Assert.NotEmpty(result);
-
-        var codeActionToRun = (VSInternalCodeAction?)result.SingleOrDefault(e => ((RazorVSInternalCodeAction)e.Value!).Name == codeActionName).Value;
-
-        if (!expectOffer)
-        {
-            Assert.Null(codeActionToRun);
-            return null;
-        }
-
-        AssertEx.NotNull(codeActionToRun, $"""
-            Could not find code action with name '{codeActionName}'.
-
-            Available:
-                {string.Join(Environment.NewLine + "    ", result.Select(e => ((RazorVSInternalCodeAction)e.Value!).Name))}
-            """);
-
-        if (codeActionToRun.Children?.Length > 0)
-        {
-            codeActionToRun = codeActionToRun.Children[childActionIndex];
-        }
-
-        Assert.NotNull(codeActionToRun);
-        return codeActionToRun;
+        return result;
     }
 
     private async Task VerifyCodeActionResultAsync(TextDocument document, WorkspaceEdit workspaceEdit, string? expected, (Uri fileUri, string contents)[]? additionalExpectedFiles = null)

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CodeActions/TypeAccessibilityTests.cs

@@ -1,7 +1,9 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
+using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Razor.CodeActions.Models;
 using Microsoft.CodeAnalysis.Razor.Protocol;
 using Xunit;
 using Xunit.Abstractions;
@@ -79,4 +81,19 @@ @using Microsoft.AspNetCore.Components.Sections
                 """,
             codeActionName: LanguageServerConstants.CodeActions.AddUsing);
     }
+
+    [Fact]
+    public async Task AddUsingShouldBeFirst()
+    {
+        var input = """
+            <div></div>
+
+            <Section[||]Outlet></SectionOutlet>
+            """;
+
+        var document = CreateRazorDocument(input);
+        var codeActions = await GetCodeActionsAsync(document, input);
+
+        Assert.Equal(LanguageServerConstants.CodeActions.AddUsing, codeActions.Select(a => ((RazorVSInternalCodeAction)a.Value!).Name).First());
+    }
 }