From bb62bb7c67762e4e1c7138e2f5701e76d474eb03 Mon Sep 17 00:00:00 2001
From: majocha <majocha@outlook.com>
Date: Wed, 1 Mar 2023 08:29:15 +0100
Subject: [PATCH 1/2] add patternmatcher assembly, reuse mef factory

---
 .../FSharp.Editor.Tests.fsproj                |  1 +
 .../Helpers/RoslynHelpers.fs                  | 19 ++++++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj b/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj
index 7a1700a3711..959eb62bc74 100644
--- a/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj
+++ b/vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj
@@ -45,6 +45,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="$(MicrosoftCodeAnalysisEditorFeaturesTextVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.ExternalAccess.FSharp" Version="$(MicrosoftCodeAnalysisExternalAccessFSharpVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Editor" Version="$(MicrosoftVisualStudioEditorVersion)" />
+    <PackageReference Include="Microsoft.VisualStudio.Platform.VSEditor" Version="$(MicrosoftVisualStudioPlatformVSEditorVersion)" />
     <PackageReference Include="Microsoft.VisualStudio.Threading" Version="$(MicrosoftVisualStudioThreadingVersion)" />
   </ItemGroup>
 
diff --git a/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs b/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs
index 9efa3ecc055..06b5f7504b9 100644
--- a/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs
+++ b/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs
@@ -28,6 +28,7 @@ module MefHelpers =
             [|
                 "Microsoft.CodeAnalysis.Workspaces.dll"
                 "Microsoft.VisualStudio.Shell.15.0.dll"
+                "Microsoft.VisualStudio.Platform.VSEditor.dll"
                 "FSharp.Editor.dll"
             |]
 
@@ -49,7 +50,7 @@ module MefHelpers =
         |> Seq.append MefHostServices.DefaultAssemblies
         |> Array.ofSeq
 
-    let createExportProvider () =
+    let exportProviderFactory =
         let resolver = Resolver.DefaultInstance
 
         let catalog =
@@ -62,15 +63,19 @@ module MefHelpers =
                 )
 
             let parts = partDiscovery.CreatePartsAsync(asms).Result
-            let catalog = ComposableCatalog.Create(resolver)
-            catalog.AddParts(parts)
+            ComposableCatalog
+                .Create(resolver)
+                .AddParts(parts)
+                .WithCompositionService()
 
         let configuration =
-            CompositionConfiguration.Create(catalog.WithCompositionService())
+            CompositionConfiguration.Create(catalog)
 
-        let runtimeComposition = RuntimeComposition.CreateRuntimeComposition(configuration)
-        let exportProviderFactory = runtimeComposition.CreateExportProviderFactory()
-        exportProviderFactory.CreateExportProvider()
+        RuntimeComposition
+            .CreateRuntimeComposition(configuration)
+            .CreateExportProviderFactory()
+
+    let createExportProvider () = exportProviderFactory.CreateExportProvider()
 
 type TestWorkspaceServiceMetadata(serviceType: string, layer: string) =
 

From 3727f3b8668b9ae32ab9fa832c17f7867252ec59 Mon Sep 17 00:00:00 2001
From: majocha <majocha@outlook.com>
Date: Wed, 1 Mar 2023 08:44:47 +0100
Subject: [PATCH 2/2] formatting

---
 .../FSharp.Editor.Tests/Helpers/RoslynHelpers.fs      | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs b/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs
index 06b5f7504b9..4927ccd1a7d 100644
--- a/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs
+++ b/vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs
@@ -63,19 +63,16 @@ module MefHelpers =
                 )
 
             let parts = partDiscovery.CreatePartsAsync(asms).Result
-            ComposableCatalog
-                .Create(resolver)
-                .AddParts(parts)
-                .WithCompositionService()
+            ComposableCatalog.Create(resolver).AddParts(parts).WithCompositionService()
 
-        let configuration =
-            CompositionConfiguration.Create(catalog)
+        let configuration = CompositionConfiguration.Create(catalog)
 
         RuntimeComposition
             .CreateRuntimeComposition(configuration)
             .CreateExportProviderFactory()
 
-    let createExportProvider () = exportProviderFactory.CreateExportProvider()
+    let createExportProvider () =
+        exportProviderFactory.CreateExportProvider()
 
 type TestWorkspaceServiceMetadata(serviceType: string, layer: string) =