Skip to content

Commit aee6745

Browse files
committed
Set parameters in zone activators explicitly
Workaround for optional parameters trigger error in F# compiler
1 parent 37994cb commit aee6745

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

ReSharper.FSharp/test/src/FSharp.Common.Tests/SciptPsiModulesTest.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ type MyTestSolutionToolset(lifetime: Lifetime, logger: ILogger) =
9595
member x.GetBuildTool() = buildTool
9696
member x.Changed = changed :> _
9797

98-
[<ZoneActivator>]
98+
[<ZoneActivator(Lifecycle.DemandReclaimable, Creation.AnyThread, Access.AnyThread)>]
9999
type SolutionHostZoneActivator() =
100100
interface IActivate<IHostSolutionZone>
101101

ReSharper.FSharp/test/src/FSharp.Common.Tests/ZoneMarker.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ do()
1919
type IFSharpTestsZone =
2020
inherit ITestsEnvZone
2121

22-
[<ZoneActivator>]
22+
[<ZoneActivator(Lifecycle.DemandReclaimable, Creation.AnyThread, Access.AnyThread)>]
2323
type PsiFeatureTestZoneActivator() =
2424
interface IActivate<PsiFeatureTestZone>
2525

26-
[<ZoneActivator>]
26+
[<ZoneActivator(Lifecycle.DemandReclaimable, Creation.AnyThread, Access.AnyThread)>]
2727
type FSharpZoneActivator() =
2828
interface IActivate<ILanguageFSharpZone>
2929

ReSharper.FSharp/test/src/FSharp.Tests/ZoneMarker.fs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
namespace JetBrains.ReSharper.Plugins.FSharp.Tests.Features
22

3+
open JetBrains.Application
34
open JetBrains.Application.BuildScript.Application.Zones
45
open JetBrains.Application.Environment
56
open JetBrains.ReSharper.Plugins.FSharp
@@ -12,11 +13,11 @@ open NUnit.Framework
1213
type IFSharpTestsZone =
1314
inherit ITestsEnvZone
1415

15-
[<ZoneActivator>]
16+
[<ZoneActivator(Lifecycle.DemandReclaimable, Creation.AnyThread, Access.AnyThread)>]
1617
type PsiFeatureTestZoneActivator() =
1718
interface IActivate<PsiFeatureTestZone>
1819

19-
[<ZoneActivator>]
20+
[<ZoneActivator(Lifecycle.DemandReclaimable, Creation.AnyThread, Access.AnyThread)>]
2021
type FSharpZoneActivator() =
2122
interface IActivate<ILanguageFSharpZone>
2223

0 commit comments

Comments
 (0)