Skip to content

Fix NavigateToSearchService tests and make FSharp.Editor.Tests faster #14829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 1, 2023
Merged

Fix NavigateToSearchService tests and make FSharp.Editor.Tests faster #14829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb62bb7
add patternmatcher assembly, reuse mef factory
majocha Mar 1, 2023
3727f3b
formatting
majocha Mar 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions vsintegration/tests/FSharp.Editor.Tests/FSharp.Editor.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
16 changes: 9 additions & 7 deletions vsintegration/tests/FSharp.Editor.Tests/Helpers/RoslynHelpers.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ module MefHelpers =
[|
"Microsoft.CodeAnalysis.Workspaces.dll"
"Microsoft.VisualStudio.Shell.15.0.dll"
"Microsoft.VisualStudio.Platform.VSEditor.dll"
"FSharp.Editor.dll"
|]

Expand All @@ -49,7 +50,7 @@ module MefHelpers =
|> Seq.append MefHostServices.DefaultAssemblies
|> Array.ofSeq

let createExportProvider () =
let exportProviderFactory =
let resolver = Resolver.DefaultInstance

let catalog =
Expand All @@ -62,14 +63,15 @@ 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)

let configuration =
CompositionConfiguration.Create(catalog.WithCompositionService())
RuntimeComposition
.CreateRuntimeComposition(configuration)
.CreateExportProviderFactory()

let runtimeComposition = RuntimeComposition.CreateRuntimeComposition(configuration)
let exportProviderFactory = runtimeComposition.CreateExportProviderFactory()
let createExportProvider () =
exportProviderFactory.CreateExportProvider()

type TestWorkspaceServiceMetadata(serviceType: string, layer: string) =
Expand Down