Remove EditorFeaturesWpf TestComposition (#78769)

After the EditorFeatures.WPF => EditorFeatures refactoring, this TestComposition became equivalent to the EditorFeatures one, so just removing the WPF one.

Author: ToddGrun

src/EditorFeatures/CSharpTest/ChangeSignature/RemoveParametersTests.cs

@@ -375,7 +375,7 @@ class C
             </Workspace>
             """),
             workspaceKind: WorkspaceKind.Interactive,
-            composition: EditorTestCompositions.EditorFeaturesWpf);
+            composition: EditorTestCompositions.EditorFeatures);
         // Force initialization.
         workspace.GetOpenDocumentIds().Select(id => workspace.GetTestDocument(id).GetTextView()).ToList();
 

src/EditorFeatures/CSharpTest/CodeActions/GenerateType/GenerateTypeTests.cs

@@ -34,7 +34,7 @@ protected override ImmutableArray<CodeAction> MassageActions(ImmutableArray<Code
 
     // TODO: Requires WPF due to IInlineRenameService dependency (https://github.com/dotnet/roslyn/issues/46153)
     protected override TestComposition GetComposition()
-        => EditorTestCompositions.EditorFeaturesWpf;
+        => EditorTestCompositions.EditorFeatures;
 
     #region Generate Class
 

src/EditorFeatures/CSharpTest/CodeActions/PreviewTests.cs

@@ -24,7 +24,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings;
 
 public sealed partial class PreviewTests : AbstractCSharpCodeActionTest
 {
-    private static readonly TestComposition s_composition = EditorTestCompositions.EditorFeaturesWpf
+    private static readonly TestComposition s_composition = EditorTestCompositions.EditorFeatures
         .AddParts(
             typeof(MockPreviewPaneService));
 

src/EditorFeatures/CSharpTest/Completion/ArgumentProviders/ArgumentProviderOrderTests.cs

@@ -24,7 +24,7 @@ public sealed class ArgumentProviderOrderTests
     [Fact]
     public void TestArgumentProviderOrder()
     {
-        var exportProvider = EditorTestCompositions.EditorFeaturesWpf.ExportProviderFactory.CreateExportProvider();
+        var exportProvider = EditorTestCompositions.EditorFeatures.ExportProviderFactory.CreateExportProvider();
         var argumentProviderExports = exportProvider.GetExports<ArgumentProvider, CompletionProviderMetadata>();
         var orderedCSharpArgumentProviders = ExtensionOrderer.Order(argumentProviderExports.Where(export => export.Metadata.Language == LanguageNames.CSharp));
 

src/EditorFeatures/CSharpTest/Completion/CompletionProviders/CompletionProviderOrderTests.cs

@@ -25,7 +25,7 @@ public sealed class CompletionProviderOrderTests
     [Fact]
     public void TestCompletionProviderOrder()
     {
-        var exportProvider = EditorTestCompositions.EditorFeaturesWpf.ExportProviderFactory.CreateExportProvider();
+        var exportProvider = EditorTestCompositions.EditorFeatures.ExportProviderFactory.CreateExportProvider();
         var completionProviderExports = exportProvider.GetExports<CompletionProvider, CompletionProviderMetadata>();
         var orderedCSharpCompletionProviders = ExtensionOrderer.Order(completionProviderExports.Where(export => export.Metadata.Language == LanguageNames.CSharp));
 

src/EditorFeatures/CSharpTest/ConvertNamespace/ConvertNamespaceCommandHandlerTests.cs

@@ -18,7 +18,7 @@ public sealed class ConvertNamespaceCommandHandlerTests
 {
     internal sealed class ConvertNamespaceTestState : AbstractCommandHandlerTestState
     {
-        private static readonly TestComposition s_composition = EditorTestCompositions.EditorFeaturesWpf.AddParts(
+        private static readonly TestComposition s_composition = EditorTestCompositions.EditorFeatures.AddParts(
             typeof(ConvertNamespaceCommandHandler));
 
         private readonly ConvertNamespaceCommandHandler _commandHandler;

src/EditorFeatures/CSharpTest/EncapsulateField/EncapsulateFieldCommandHandlerTests.cs

@@ -202,7 +202,7 @@ class C
             </Workspace>
             """),
             workspaceKind: WorkspaceKind.Interactive,
-            composition: EditorTestCompositions.EditorFeaturesWpf);
+            composition: EditorTestCompositions.EditorFeatures);
         // Force initialization.
         workspace.GetOpenDocumentIds().Select(id => workspace.GetTestDocument(id).GetTextView()).ToList();
 

src/EditorFeatures/CSharpTest/EventHookup/EventHookupTestState.cs

@@ -21,7 +21,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.EventHookup;
 
 internal sealed class EventHookupTestState : AbstractCommandHandlerTestState
 {
-    private static readonly TestComposition s_composition = EditorTestCompositions.EditorFeaturesWpf.AddParts(
+    private static readonly TestComposition s_composition = EditorTestCompositions.EditorFeatures.AddParts(
         typeof(EventHookupCommandHandler),
         typeof(EventHookupSessionManager));
 

src/EditorFeatures/CSharpTest/ExtractInterface/ExtractInterfaceTests.cs

@@ -1449,7 +1449,7 @@ public void M() { }
             </Workspace>
             """),
             workspaceKind: WorkspaceKind.Interactive,
-            composition: EditorTestCompositions.EditorFeaturesWpf);
+            composition: EditorTestCompositions.EditorFeatures);
         // Force initialization.
         workspace.GetOpenDocumentIds().Select(id => workspace.GetTestDocument(id)!.GetTextView()).ToList();
 

src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodMiscellaneousTests.cs

@@ -131,7 +131,7 @@ class A
 
     private static async Task TestCommandHandler(string markupCode, string? result, bool expectNotification)
     {
-        using var workspace = EditorTestWorkspace.CreateCSharp(markupCode, composition: EditorTestCompositions.EditorFeaturesWpf);
+        using var workspace = EditorTestWorkspace.CreateCSharp(markupCode, composition: EditorTestCompositions.EditorFeatures);
         var testDocument = workspace.Documents.Single();
 
         var view = testDocument.GetTextView();

src/EditorFeatures/CSharpTest/ExtractMethod/ExtractMethodTests.cs

@@ -11504,7 +11504,7 @@ public void ExtractMethodCommandDisabledInSubmission()
             </Workspace>
             """),
             workspaceKind: WorkspaceKind.Interactive,
-            composition: EditorTestCompositions.EditorFeaturesWpf);
+            composition: EditorTestCompositions.EditorFeatures);
         // Force initialization.
         workspace.GetOpenDocumentIds().Select(id => workspace.GetTestDocument(id)!.GetTextView()).ToList();
 

src/EditorFeatures/CSharpTest/Formatting/CodeCleanupTests.cs

@@ -782,7 +782,7 @@ private static async Task TestThirdPartyCodeFixer<TCodefix, TAnalyzer>(string co
         where TCodefix : CodeFixProvider, new()
     {
 
-        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeaturesWpf.AddParts(typeof(TCodefix)));
+        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeatures.AddParts(typeof(TCodefix)));
 
         var project = workspace.CurrentSolution.Projects.Single();
         var analyzer = (DiagnosticAnalyzer)new TAnalyzer();
@@ -833,12 +833,12 @@ static EditorTestWorkspace GetTestWorkspaceForLanguage(string language)
         {
             if (language == LanguageNames.CSharp)
             {
-                return EditorTestWorkspace.CreateCSharp(string.Empty, composition: EditorTestCompositions.EditorFeaturesWpf);
+                return EditorTestWorkspace.CreateCSharp(string.Empty, composition: EditorTestCompositions.EditorFeatures);
             }
 
             if (language == LanguageNames.VisualBasic)
             {
-                return EditorTestWorkspace.CreateVisualBasic(string.Empty, composition: EditorTestCompositions.EditorFeaturesWpf);
+                return EditorTestWorkspace.CreateVisualBasic(string.Empty, composition: EditorTestCompositions.EditorFeatures);
             }
 
             return null;
@@ -871,7 +871,7 @@ private static Task AssertCodeCleanupResult(string expected, string code, bool s
     /// <returns>The <see cref="Task"/> to test code cleanup.</returns>
     private static async Task AssertCodeCleanupResult(string expected, string code, CodeStyleOption2<AddImportPlacement> preferredImportPlacement, bool systemUsingsFirst = true, bool separateUsingGroups = false, Func<string, bool> enabledFixIdsFilter = null, (string, DiagnosticSeverity)[] diagnosticIdsWithSeverity = null)
     {
-        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeaturesWpf);
+        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeatures);
 
         // must set global options since incremental analyzer infra reads from global options
         workspace.SetAnalyzerFallbackAndGlobalOptions(new OptionsCollection(LanguageNames.CSharp)

src/EditorFeatures/CSharpTest/Organizing/OrganizeTypeDeclarationTests.cs

@@ -1175,7 +1175,7 @@ class C
             </Workspace>
             """),
             workspaceKind: WorkspaceKind.Interactive,
-            composition: EditorTestCompositions.EditorFeaturesWpf);
+            composition: EditorTestCompositions.EditorFeatures);
         // Force initialization.
         workspace.GetOpenDocumentIds().Select(id => workspace.GetTestDocument(id).GetTextView()).ToList();
 

src/EditorFeatures/CSharpTest/RawStringLiteral/RawStringLiteralCommandHandlerTests.cs

@@ -19,7 +19,7 @@ public sealed class RawStringLiteralCommandHandlerTests
 {
     internal sealed class RawStringLiteralTestState : AbstractCommandHandlerTestState
     {
-        private static readonly TestComposition s_composition = EditorTestCompositions.EditorFeaturesWpf.AddParts(
+        private static readonly TestComposition s_composition = EditorTestCompositions.EditorFeatures.AddParts(
             typeof(RawStringLiteralCommandHandler));
 
         private readonly RawStringLiteralCommandHandler _commandHandler;

src/EditorFeatures/CSharpTest/StringCopyPaste/StringCopyPasteCommandHandlerTests.cs

@@ -29,11 +29,11 @@ public abstract class StringCopyPasteCommandHandlerTests
     internal sealed class StringCopyPasteTestState : AbstractCommandHandlerTestState
     {
         private static readonly TestComposition s_composition =
-            EditorTestCompositions.EditorFeaturesWpf
+            EditorTestCompositions.EditorFeatures
                 .AddParts(typeof(StringCopyPasteCommandHandler));
 
         private static readonly TestComposition s_compositionWithMockCopyPasteService =
-            EditorTestCompositions.EditorFeaturesWpf
+            EditorTestCompositions.EditorFeatures
                 .RemoveExcludedPartTypes(typeof(WpfStringCopyPasteService))
                 .AddParts(typeof(TestStringCopyPasteService))
                 .AddParts(typeof(StringCopyPasteCommandHandler));

src/EditorFeatures/DiagnosticsTestUtilities/Diagnostics/AbstractUserDiagnosticTest_GenerateTypeDialog.cs

@@ -23,7 +23,7 @@ namespace Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics;
 public abstract partial class AbstractUserDiagnosticTest
 {
     // TODO: IInlineRenameService requires WPF (https://github.com/dotnet/roslyn/issues/46153)
-    private static readonly TestComposition s_composition = EditorTestCompositions.EditorFeaturesWpf
+    private static readonly TestComposition s_composition = EditorTestCompositions.EditorFeatures
         .AddParts(
             typeof(TestGenerateTypeOptionsService),
             typeof(TestProjectManagementService));

src/EditorFeatures/DiagnosticsTestUtilities/MoveType/AbstractMoveTypeTest.cs

@@ -30,7 +30,7 @@ public abstract class AbstractMoveTypeTest : AbstractCodeActionTest
 
     // TODO: Requires WPF due to IInlineRenameService dependency (https://github.com/dotnet/roslyn/issues/46153)
     protected override TestComposition GetComposition()
-        => EditorTestCompositions.EditorFeaturesWpf;
+        => EditorTestCompositions.EditorFeatures;
 
     protected override CodeRefactoringProvider CreateCodeRefactoringProvider(EditorTestWorkspace workspace, TestParameters parameters)
         => new MoveTypeCodeRefactoringProvider();

src/EditorFeatures/Test/LinkedFiles/LinkedFileDiffMergingEditorTests.cs

@@ -52,7 +52,7 @@ protected override CodeRefactoringProvider CreateCodeRefactoringProvider(EditorT
     public async Task TestCodeActionPreviewAndApply()
     {
         // TODO: WPF required due to https://github.com/dotnet/roslyn/issues/46153
-        using var workspace = EditorTestWorkspace.Create(WorkspaceXml, composition: EditorTestCompositions.EditorFeaturesWpf);
+        using var workspace = EditorTestWorkspace.Create(WorkspaceXml, composition: EditorTestCompositions.EditorFeatures);
         var codeIssueOrRefactoring = await GetCodeRefactoringAsync(workspace, new TestParameters());
 
         await TestActionOnLinkedFiles(

src/EditorFeatures/Test/RenameTracking/RenameTrackingTestState.cs

@@ -128,7 +128,7 @@ private static EditorTestWorkspace CreateTestWorkspace(string code, string langu
 
     private static EditorTestWorkspace CreateTestWorkspace(string xml)
     {
-        return EditorTestWorkspace.Create(xml, composition: EditorTestCompositions.EditorFeaturesWpf);
+        return EditorTestWorkspace.Create(xml, composition: EditorTestCompositions.EditorFeatures);
     }
 
     public void SendEscape()

src/EditorFeatures/Test/Structure/StructureTaggerTests.cs

@@ -52,7 +52,7 @@ static void Main(string[] args)
 #endregion
 }";
 
-        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeaturesWpf);
+        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeatures);
         var globalOptions = workspace.GlobalOptions;
 
         globalOptions.SetGlobalOption(BlockStructureOptionsStorage.CollapseRegionsWhenCollapsingToDefinitions, LanguageNames.CSharp, collapseRegionsWhenCollapsingToDefinitions);
@@ -119,7 +119,7 @@ public class Bar
 }
 ";
 
-        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeaturesWpf);
+        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeatures);
         var globalOptions = workspace.GlobalOptions;
 
         globalOptions.SetGlobalOption(BlockStructureOptionsStorage.CollapseRegionsWhenCollapsingToDefinitions, LanguageNames.CSharp, collapseRegionsWhenCollapsingToDefinitions);
@@ -164,7 +164,7 @@ public class Bar
 }
 ";
 
-        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeaturesWpf);
+        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeatures);
         var globalOptions = workspace.GlobalOptions;
 
         globalOptions.SetGlobalOption(BlockStructureOptionsStorage.CollapseRegionsWhenCollapsingToDefinitions, LanguageNames.CSharp, collapseRegionsWhenCollapsingToDefinitions);
@@ -209,7 +209,7 @@ public class Bar
 }
 ";
 
-        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeaturesWpf);
+        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeatures);
         var globalOptions = workspace.GlobalOptions;
 
         globalOptions.SetGlobalOption(BlockStructureOptionsStorage.CollapseRegionsWhenCollapsingToDefinitions, LanguageNames.CSharp, collapseRegionsWhenCollapsingToDefinitions);
@@ -261,7 +261,7 @@ End Module
 #End Region
 End Namespace";
 
-        using var workspace = EditorTestWorkspace.CreateVisualBasic(code, composition: EditorTestCompositions.EditorFeaturesWpf);
+        using var workspace = EditorTestWorkspace.CreateVisualBasic(code, composition: EditorTestCompositions.EditorFeatures);
         var globalOptions = workspace.GlobalOptions;
 
         globalOptions.SetGlobalOption(BlockStructureOptionsStorage.CollapseRegionsWhenCollapsingToDefinitions, LanguageNames.VisualBasic, collapseRegionsWhenCollapsingToDefinitions);
@@ -317,7 +317,7 @@ Sub Main(args As String())
     End Sub
 End Module";
 
-        using var workspace = EditorTestWorkspace.CreateVisualBasic(code, composition: EditorTestCompositions.EditorFeaturesWpf);
+        using var workspace = EditorTestWorkspace.CreateVisualBasic(code, composition: EditorTestCompositions.EditorFeatures);
         var tags = await GetTagsFromWorkspaceAsync(workspace);
 
         var hints = tags.Select(x => x.GetCollapsedHintForm()).Cast<ViewHostingControl>().ToArray();
@@ -339,7 +339,7 @@ End If
     End Sub
 End Module";
 
-        using var workspace = EditorTestWorkspace.CreateVisualBasic(code, composition: EditorTestCompositions.EditorFeaturesWpf);
+        using var workspace = EditorTestWorkspace.CreateVisualBasic(code, composition: EditorTestCompositions.EditorFeatures);
         var tags = await GetTagsFromWorkspaceAsync(workspace);
         Assert.Collection(tags, programTag =>
         {
@@ -371,7 +371,7 @@ public void MyMethod() => System.Linq.Enumerable.Range(10, 100).Any(x =>
             }
             """;
 
-        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeaturesWpf);
+        using var workspace = EditorTestWorkspace.CreateCSharp(code, composition: EditorTestCompositions.EditorFeatures);
         var tags = await GetTagsFromWorkspaceAsync(workspace);
 
         Assert.Collection(tags, programTag =>

src/EditorFeatures/Test/Tagging/AsynchronousTaggerTests.cs

@@ -99,7 +99,7 @@ public void TestNotSynchronousOutlining()
             class Program {
 
             }
-            """, composition: EditorTestCompositions.EditorFeaturesWpf);
+            """, composition: EditorTestCompositions.EditorFeatures);
         WpfTestRunner.RequireWpfFact($"{nameof(AsynchronousTaggerTests)}.{nameof(TestNotSynchronousOutlining)} creates asynchronous taggers");
 
         var tagProvider = workspace.ExportProvider.GetExportedValue<AbstractStructureTaggerProvider>();
@@ -125,7 +125,7 @@ class Program
             }
 
             #endregion
-            """, composition: EditorTestCompositions.EditorFeaturesWpf);
+            """, composition: EditorTestCompositions.EditorFeatures);
         WpfTestRunner.RequireWpfFact($"{nameof(AsynchronousTaggerTests)}.{nameof(TestSynchronousOutlining)} creates asynchronous taggers");
 
         var tagProvider = workspace.ExportProvider.GetExportedValue<AbstractStructureTaggerProvider>();

src/EditorFeatures/Test2/InteractivePaste/InteractivePasteCommandHandlerTests.vb

@@ -34,7 +34,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InteractivePaste
                             <Document/>
                         </Project>
                     </Workspace>,
-                    composition:=EditorTestCompositions.EditorFeaturesWpf)
+                    composition:=EditorTestCompositions.EditorFeatures)
 
                 Dim textView = workspace.Documents.Single().GetTextView()
 
@@ -68,7 +68,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InteractivePaste
                             <Document/>
                         </Project>
                     </Workspace>,
-                    composition:=EditorTestCompositions.EditorFeaturesWpf)
+                    composition:=EditorTestCompositions.EditorFeatures)
 
                 Dim textView = workspace.Documents.Single().GetTextView()
                 Dim editorOperations = workspace.GetService(Of IEditorOperationsFactoryService)().GetEditorOperations(textView)
@@ -104,7 +104,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InteractivePaste
                             <Document/>
                         </Project>
                     </Workspace>,
-                    composition:=EditorTestCompositions.EditorFeaturesWpf)
+                    composition:=EditorTestCompositions.EditorFeatures)
 
                 Dim textView = workspace.Documents.Single().GetTextView()
                 Dim editorOperations = workspace.GetService(Of IEditorOperationsFactoryService)().GetEditorOperations(textView)
@@ -144,7 +144,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InteractivePaste
                             <Document/>
                         </Project>
                     </Workspace>,
-                    composition:=EditorTestCompositions.EditorFeaturesWpf)
+                    composition:=EditorTestCompositions.EditorFeatures)
 
                 Dim textView = workspace.Documents.Single().GetTextView()
                 Dim editorOperations = workspace.GetService(Of IEditorOperationsFactoryService)().GetEditorOperations(textView)
@@ -188,7 +188,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.InteractivePaste
                             <Document/>
                         </Project>
                     </Workspace>,
-                    composition:=EditorTestCompositions.EditorFeaturesWpf)
+                    composition:=EditorTestCompositions.EditorFeatures)
 
                 Dim textView = workspace.Documents.Single().GetTextView()
                 Dim editorOperations = workspace.GetService(Of IEditorOperationsFactoryService)().GetEditorOperations(textView)

src/EditorFeatures/Test2/Peek/PeekTests.vb

@@ -289,7 +289,7 @@ public partial class D
         End Sub
 
         Private Shared Function CreateTestWorkspace(element As XElement) As EditorTestWorkspace
-            Return EditorTestWorkspace.Create(element, composition:=EditorTestCompositions.EditorFeaturesWpf)
+            Return EditorTestWorkspace.Create(element, composition:=EditorTestCompositions.EditorFeatures)
         End Function
 
         Private Shared Function GetPeekResultCollection(element As XElement) As PeekResultCollection

src/EditorFeatures/Test2/Rename/RenameCommandHandlerTests.vb

@@ -58,7 +58,7 @@ Namespace Microsoft.CodeAnalysis.Editor.UnitTests.Rename
                     </Submission>
                 </Workspace>,
                 workspaceKind:=WorkspaceKind.Interactive,
-                composition:=EditorTestCompositions.EditorFeaturesWpf)
+                composition:=EditorTestCompositions.EditorFeatures)
 
                 ' Force initialization.
                 workspace.GetOpenDocumentIds().Select(Function(id) workspace.GetTestDocument(id).GetTextView()).ToList()