Fix bad test

The imports document it expected to add to was outside the project cone, which should never have worked.

Author: davidwengier

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

@@ -36,10 +36,11 @@ private protected async Task VerifyCodeActionAsync(
         string codeActionName,
         int childActionIndex = 0,
         RazorFileKind? fileKind = null,
+        string? documentFilePath = null,
         (string filePath, string contents)[]? additionalFiles = null,
         (Uri fileUri, string contents)[]? additionalExpectedFiles = null)
     {
-        var document = CreateRazorDocument(input, fileKind, additionalFiles);
+        var document = CreateRazorDocument(input, fileKind, documentFilePath, additionalFiles);
 
         var codeAction = await VerifyCodeActionRequestAsync(document, input, codeActionName, childActionIndex, expectOffer: expected is not null);
 
@@ -56,7 +57,7 @@ private protected async Task VerifyCodeActionAsync(
         await VerifyCodeActionResultAsync(document, workspaceEdit, expected, additionalExpectedFiles);
     }
 
-    private protected TextDocument CreateRazorDocument(TestCode input, RazorFileKind? fileKind = null, (string filePath, string contents)[]? additionalFiles = null)
+    private protected TextDocument CreateRazorDocument(TestCode input, RazorFileKind? fileKind = null, string? documentFilePath = null, (string filePath, string contents)[]? additionalFiles = null)
     {
         var fileSystem = (RemoteFileSystem)OOPExportProvider.GetExportedValue<IFileSystem>();
         fileSystem.GetTestAccessor().SetFileSystem(new TestFileSystem(additionalFiles));
@@ -74,7 +75,7 @@ private protected TextDocument CreateRazorDocument(TestCode input, RazorFileKind
             return options;
         });
 
-        return CreateProjectAndRazorDocument(input.Text, fileKind, createSeparateRemoteAndLocalWorkspaces: true, additionalFiles: additionalFiles);
+        return CreateProjectAndRazorDocument(input.Text, fileKind, documentFilePath, createSeparateRemoteAndLocalWorkspaces: true, additionalFiles: additionalFiles);
     }
 
     private async Task<CodeAction?> VerifyCodeActionRequestAsync(TextDocument document, TestCode input, string codeActionName, int childActionIndex, bool expectOffer)

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

@@ -99,8 +99,9 @@ @using [||]System
                     Hello World
                 </div>
                 """,
+            documentFilePath: FilePath(@"My\Deeply\Nested\File.razor"),
             additionalFiles: [
-                (FilePath(@"..\_Imports.razor"), """
+                (FilePath(@"My\Deeply\_Imports.razor"), """
                     @using System.Text
                     @using Foo.Bar
                     """)],
@@ -112,7 +113,7 @@ Hello World
                 """,
             codeActionName: LanguageServerConstants.CodeActions.PromoteUsingDirective,
             additionalExpectedFiles: [
-                (FileUri(@"..\_Imports.razor"), """
+                (FileUri(@"My\Deeply\_Imports.razor"), """
                     @using System.Text
                     @using Foo.Bar
                     @using System
@@ -130,8 +131,9 @@ @using [||]System
                     Hello World
                 </div>
                 """,
+            documentFilePath: FilePath(@"My\Deeply\Nested\File.razor"),
             additionalFiles: [
-                (FilePath(@"..\_Imports.razor"), """
+                (FilePath(@"My\Deeply\_Imports.razor"), """
                     @using System.Text
                     @using Foo.Bar
                     
@@ -144,7 +146,7 @@ Hello World
                 """,
             codeActionName: LanguageServerConstants.CodeActions.PromoteUsingDirective,
             additionalExpectedFiles: [
-                (FileUri(@"..\_Imports.razor"), """
+                (FileUri(@"My\Deeply\_Imports.razor"), """
                     @using System.Text
                     @using Foo.Bar
                     @using System
@@ -162,8 +164,9 @@ @using [||]System
                     Hello World
                 </div>
                 """,
+            documentFilePath: FilePath(@"My\Deeply\Nested\File.razor"),
             additionalFiles: [
-                (FilePath(@"..\_Imports.razor"), """
+                (FilePath(@"My\Deeply\_Imports.razor"), """
                     @using System.Text
                     @using Foo.Bar
                         
@@ -176,7 +179,7 @@ Hello World
                 """,
             codeActionName: LanguageServerConstants.CodeActions.PromoteUsingDirective,
             additionalExpectedFiles: [
-                (FileUri(@"..\_Imports.razor"), """
+                (FileUri(@"My\Deeply\_Imports.razor"), """
                     @using System.Text
                     @using Foo.Bar
                     @using System    

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostEndpointTestBase.cs

@@ -155,6 +155,7 @@ private protected virtual TestComposition ConfigureRoslynDevenvComposition(TestC
     protected TextDocument CreateProjectAndRazorDocument(
         string contents,
         RazorFileKind? fileKind = null,
+        string? documentFilePath = null,
         (string fileName, string contents)[]? additionalFiles = null,
         bool createSeparateRemoteAndLocalWorkspaces = false,
         bool inGlobalNamespace = false,
@@ -163,7 +164,7 @@ protected TextDocument CreateProjectAndRazorDocument(
         // Using IsLegacy means null == component, so easier for test authors
         var isComponent = fileKind != RazorFileKind.Legacy;
 
-        var documentFilePath = isComponent
+        documentFilePath ??= isComponent
             ? TestProjectData.SomeProjectComponentFile1.FilePath
             : TestProjectData.SomeProjectFile1.FilePath;
 

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostGoToDefinitionEndpointTest.cs

@@ -418,7 +418,7 @@ private async Task VerifyGoToDefinitionAsync(
         SumType<LspLocation, LspLocation[], DocumentLink[]>? htmlResponse = null,
         params (string fileName, string contents)[]? additionalFiles)
     {
-        var document = CreateProjectAndRazorDocument(input.Text, fileKind, additionalFiles);
+        var document = CreateProjectAndRazorDocument(input.Text, fileKind, additionalFiles: additionalFiles);
         return await GetGoToDefinitionResultCoreAsync(document, input, htmlResponse);
     }
 

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/CohostRenameEndpointTest.cs

@@ -174,7 +174,7 @@ private async Task VerifyRenamesAsync(
         (string oldName, string newName)[]? renames = null)
     {
         TestFileMarkupParser.GetPosition(input, out var source, out var cursorPosition);
-        var document = CreateProjectAndRazorDocument(source, fileKind, additionalFiles);
+        var document = CreateProjectAndRazorDocument(source, fileKind, additionalFiles: additionalFiles);
         var inputText = await document.GetTextAsync(DisposalToken);
         var position = inputText.GetPosition(cursorPosition);
 

src/Razor/test/Microsoft.VisualStudio.LanguageServices.Razor.Test/Cohost/DefinitionServiceTest.cs

@@ -61,7 +61,7 @@ await VerifyDefinitionAsync(input, surveyPrompt,
 
     private async Task VerifyDefinitionAsync(TestCode input, TestCode expectedDocument, params (string fileName, string contents)[]? additionalFiles)
     {
-        var document = CreateProjectAndRazorDocument(input.Text, RazorFileKind.Component, additionalFiles);
+        var document = CreateProjectAndRazorDocument(input.Text, RazorFileKind.Component, additionalFiles: additionalFiles);
 
         var service = OOPExportProvider.GetExportedValue<IDefinitionService>();
         var snapshotManager = OOPExportProvider.GetExportedValue<RemoteSnapshotManager>();