More fixes

src/EditorFeatures/Test/Diagnostics/DiagnosticDataSerializerTests.cs

@@ -19,6 +19,7 @@
 using Roslyn.Utilities;
 using Xunit;
 using Traits = Microsoft.CodeAnalysis.Test.Utilities.Traits;
+using Microsoft.CodeAnalysis.Editor.UnitTests.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.UnitTests.Diagnostics
 {
@@ -27,7 +28,7 @@ public class DiagnosticDataSerializerTests : TestBase
         [Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)]
         public async Task SerializationTest_Document()
         {
-            using (var workspace = new TestWorkspace(TestExportProvider.ExportProviderWithCSharpAndVisualBasic, workspaceKind: "DiagnosticDataSerializerTest"))
+            using (var workspace = new TestWorkspace(EditorServicesUtil.ExportProvider, workspaceKind: "DiagnosticDataSerializerTest"))
             {
                 var document = workspace.CurrentSolution.AddProject("TestProject", "TestProject", LanguageNames.CSharp).AddDocument("TestDocument", "");
 
@@ -70,7 +71,7 @@ public async Task SerializationTest_Document()
         [Fact, Trait(Traits.Feature, Traits.Features.Diagnostics)]
         public async Task SerializationTest_Project()
         {
-            using (var workspace = new TestWorkspace(TestExportProvider.ExportProviderWithCSharpAndVisualBasic, workspaceKind: "DiagnosticDataSerializerTest"))
+            using (var workspace = new TestWorkspace(EditorServicesUtil.ExportProvider, workspaceKind: "DiagnosticDataSerializerTest"))
             {
                 var document = workspace.CurrentSolution.AddProject("TestProject", "TestProject", LanguageNames.CSharp).AddDocument("TestDocument", "");
 

src/EditorFeatures/Test/EditorAdapter/TextSpanExtensionsTest.cs

@@ -8,6 +8,7 @@
 using Roslyn.Test.EditorUtilities;
 using Roslyn.Test.Utilities;
 using Xunit;
+using Microsoft.CodeAnalysis.Editor.UnitTests.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.UnitTests.EditorAdapter
 {
@@ -31,7 +32,7 @@ public void ConvertToSpan()
         [Fact]
         public void ConvertToSnapshotSpan1()
         {
-            var snapshot = EditorFactory.CreateBuffer(TestExportProvider.ExportProviderWithCSharpAndVisualBasic, new string('a', 10)).CurrentSnapshot;
+            var snapshot = EditorFactory.CreateBuffer(EditorServicesUtil.ExportProvider, new string('a', 10)).CurrentSnapshot;
             var textSpan = new TextSpan(0, 5);
             var ss = textSpan.ToSnapshotSpan(snapshot);
             Assert.Same(snapshot, ss.Snapshot);
@@ -42,7 +43,7 @@ public void ConvertToSnapshotSpan1()
         [Fact]
         public void ConvertToSnapshotSpan2()
         {
-            var snapshot = EditorFactory.CreateBuffer(TestExportProvider.ExportProviderWithCSharpAndVisualBasic, new string('a', 10)).CurrentSnapshot;
+            var snapshot = EditorFactory.CreateBuffer(EditorServicesUtil.ExportProvider, new string('a', 10)).CurrentSnapshot;
             var textSpan = new TextSpan(0, 10);
             var ss = textSpan.ToSnapshotSpan(snapshot);
             Assert.Same(snapshot, ss.Snapshot);

src/EditorFeatures/Test/Preview/PreviewWorkspaceTests.cs

@@ -27,6 +27,7 @@
 using Roslyn.Utilities;
 using Xunit;
 using Microsoft.CodeAnalysis.Editor.Implementation.Preview;
+using Microsoft.CodeAnalysis.Editor.UnitTests.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.UnitTests.Preview
 {
@@ -133,7 +134,7 @@ public void TestPreviewOpenCloseFile()
         [Fact, Trait(Traits.Editor, Traits.Editors.Preview)]
         public void TestPreviewServices()
         {
-            using (var previewWorkspace = new PreviewWorkspace(MefV1HostServices.Create(TestExportProvider.ExportProviderWithCSharpAndVisualBasic.AsExportProvider())))
+            using (var previewWorkspace = new PreviewWorkspace(MefV1HostServices.Create(EditorServicesUtil.ExportProvider.AsExportProvider())))
             {
                 var service = previewWorkspace.Services.GetService<ISolutionCrawlerRegistrationService>();
                 Assert.True(service is PreviewSolutionCrawlerRegistrationServiceFactory.Service);
@@ -150,12 +151,12 @@ public void TestPreviewServices()
         [WpfFact, Trait(Traits.Editor, Traits.Editors.Preview)]
         public void TestPreviewDiagnostic()
         {
-            var diagnosticService = TestExportProvider.ExportProviderWithCSharpAndVisualBasic.GetExportedValue<IDiagnosticAnalyzerService>() as IDiagnosticUpdateSource;
+            var diagnosticService = EditorServicesUtil.ExportProvider.GetExportedValue<IDiagnosticAnalyzerService>() as IDiagnosticUpdateSource;
 
             var taskSource = new TaskCompletionSource<DiagnosticsUpdatedArgs>();
             diagnosticService.DiagnosticsUpdated += (s, a) => taskSource.TrySetResult(a);
 
-            using (var previewWorkspace = new PreviewWorkspace(MefV1HostServices.Create(TestExportProvider.ExportProviderWithCSharpAndVisualBasic.AsExportProvider())))
+            using (var previewWorkspace = new PreviewWorkspace(MefV1HostServices.Create(EditorServicesUtil.ExportProvider.AsExportProvider())))
             {
                 var solution = previewWorkspace.CurrentSolution
                                                .AddProject("project", "project.dll", LanguageNames.CSharp)
@@ -180,7 +181,7 @@ public void TestPreviewDiagnostic()
         [WpfFact]
         public async Task TestPreviewDiagnosticTagger()
         {
-            using (var workspace = await TestWorkspace.CreateCSharpAsync("class { }"))
+            using (var workspace = await TestWorkspace.CreateCSharpAsync("class { }", exportProvider: EditorServicesUtil.ExportProvider))
             using (var previewWorkspace = new PreviewWorkspace(workspace.CurrentSolution))
             {
                 //// preview workspace and owner of the solution now share solution and its underlying text buffer
@@ -201,7 +202,7 @@ public async Task TestPreviewDiagnosticTagger()
         [WpfFact(Skip = "https://github.com/dotnet/roslyn/issues/14444")]
         public async Task TestPreviewDiagnosticTaggerInPreviewPane()
         {
-            using (var workspace = await TestWorkspace.CreateCSharpAsync("class { }"))
+            using (var workspace = await TestWorkspace.CreateCSharpAsync("class { }", exportProvider: EditorServicesUtil.ExportProvider))
             {
                 // set up listener to wait until diagnostic finish running
                 var diagnosticService = workspace.ExportProvider.GetExportedValue<IDiagnosticService>() as DiagnosticService;

src/EditorFeatures/Test/RenameTracking/RenameTrackingTestState.cs

@@ -27,6 +27,7 @@
 using Roslyn.Test.Utilities;
 using Roslyn.Utilities;
 using Xunit;
+using Microsoft.CodeAnalysis.Editor.UnitTests.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.UnitTests.RenameTracking
 {
@@ -56,7 +57,7 @@ internal sealed class RenameTrackingTestState : IDisposable
             bool onBeforeGlobalSymbolRenamedReturnValue = true,
             bool onAfterGlobalSymbolRenamedReturnValue = true)
         {
-            var workspace = await CreateTestWorkspaceAsync(markup, languageName, TestExportProvider.CreateExportProviderWithCSharpAndVisualBasic());
+            var workspace = await CreateTestWorkspaceAsync(markup, languageName, EditorServicesUtil.CreateExportProvider());
             return new RenameTrackingTestState(workspace, languageName, onBeforeGlobalSymbolRenamedReturnValue, onAfterGlobalSymbolRenamedReturnValue);
         }
 
@@ -67,8 +68,8 @@ internal sealed class RenameTrackingTestState : IDisposable
             bool onAfterGlobalSymbolRenamedReturnValue = true)
         {
             var workspace = await TestWorkspace.CreateAsync(
-                workspaceXml, 
-                exportProvider: TestExportProvider.CreateExportProviderWithCSharpAndVisualBasic());
+                workspaceXml,
+                exportProvider: EditorServicesUtil.CreateExportProvider());
 
             return new RenameTrackingTestState(workspace, languageName, onBeforeGlobalSymbolRenamedReturnValue, onAfterGlobalSymbolRenamedReturnValue);
         }

src/EditorFeatures/Test/SolutionCrawler/WorkCoordinatorTests.cs

@@ -15,6 +15,7 @@
 using Roslyn.Test.Utilities;
 using Roslyn.Utilities;
 using Xunit;
+using Microsoft.CodeAnalysis.Editor.UnitTests.Utilities;
 
 namespace Microsoft.CodeAnalysis.Editor.UnitTests.SolutionCrawler
 {
@@ -825,7 +826,7 @@ public async Task ProgressReporterTest()
         private async Task InsertText(string code, string text, bool expectDocumentAnalysis, string language = LanguageNames.CSharp)
         {
             using (var workspace = await TestWorkspace.CreateAsync(
-                SolutionCrawler, language, compilationOptions: null, parseOptions: null, content: code, exportProvider: CreateExportProvider()))
+                SolutionCrawler, language, compilationOptions: null, parseOptions: null, content: code, exportProvider: EditorServicesUtil.ExportProvider))
             {
                 SetOptions(workspace);
 
@@ -904,15 +905,6 @@ private async Task WaitWaiterAsync(ExportProvider provider)
             await solutionCrawlerWaiter.CreateWaitTask();
         }
 
-        private static ExportProvider CreateExportProvider()
-        {
-            var assemblies = TestExportProvider
-                .GetCSharpAndVisualBasicAssemblies()
-                .Concat(new[] { typeof(WorkCoordinatorWorkspace).Assembly });
-            var catalog = MinimalTestExportProvider.CreateAssemblyCatalog(assemblies, MinimalTestExportProvider.CreateResolver());
-            return MinimalTestExportProvider.CreateExportProvider(catalog);
-        }
-
         private static SolutionInfo GetInitialSolutionInfoWithP2P()
         {
             var projectId1 = ProjectId.CreateNewId();
@@ -1015,7 +1007,7 @@ private class WorkCoordinatorWorkspace : TestWorkspace
             private readonly IAsynchronousOperationWaiter _solutionCrawlerWaiter;
 
             public WorkCoordinatorWorkspace(string workspaceKind = null, bool disablePartialSolutions = true)
-                : base(CreateExportProvider(), workspaceKind, disablePartialSolutions)
+                : base(EditorServicesUtil.CreateExportProvider(), workspaceKind, disablePartialSolutions)
             {
                 _workspaceWaiter = GetListeners(ExportProvider).First(l => l.Metadata.FeatureName == FeatureAttribute.Workspace).Value as IAsynchronousOperationWaiter;
                 _solutionCrawlerWaiter = GetListeners(ExportProvider).First(l => l.Metadata.FeatureName == FeatureAttribute.SolutionCrawler).Value as IAsynchronousOperationWaiter;

src/EditorFeatures/Test/Utilities/EditorServicesUtil.cs

+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Linq;
+using Roslyn.Utilities;
+using Microsoft.VisualStudio.Composition;
+using System;
+
+namespace Microsoft.CodeAnalysis.Editor.UnitTests.Utilities
+{
+    public static class EditorServicesUtil
+    {
+        private static Lazy<ExportProvider> s_lazyExportProvider = new Lazy<ExportProvider>(CreateExportProvider);
+
+        public static ExportProvider ExportProvider => s_lazyExportProvider.Value;
+
+        public static ExportProvider CreateExportProvider()
+        {
+            var assemblies = TestExportProvider
+                .GetCSharpAndVisualBasicAssemblies()
+                .Concat(new[] { typeof(EditorServicesUtil).Assembly });
+            var catalog = MinimalTestExportProvider.CreateAssemblyCatalog(assemblies, MinimalTestExportProvider.CreateResolver());
+            return MinimalTestExportProvider.CreateExportProvider(catalog);
+        }
+    }
+}