Skip to content

Commit 37994cb

Browse files
committed
Fix for API change (IActivate)
1 parent 88cafce commit 37994cb

File tree

3 files changed

+6
-13
lines changed

3 files changed

+6
-13
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ type MyTestSolutionToolset(lifetime: Lifetime, logger: ILogger) =
9797

9898
[<ZoneActivator>]
9999
type SolutionHostZoneActivator() =
100-
interface IActivate<IHostSolutionZone> with
101-
member x.ActivatorEnabled() = true
100+
interface IActivate<IHostSolutionZone>
102101

103102

104103
[<SolutionInstanceComponent>]

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

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,19 @@ open JetBrains.TestFramework.Application.Zones
1313
open NUnit.Framework
1414

1515
[<assembly: Apartment(ApartmentState.STA)>]
16-
do()
16+
do()
1717

1818
[<ZoneDefinition>]
1919
type IFSharpTestsZone =
2020
inherit ITestsEnvZone
2121

2222
[<ZoneActivator>]
2323
type PsiFeatureTestZoneActivator() =
24-
interface IActivate<PsiFeatureTestZone> with
25-
member x.ActivatorEnabled() = true
26-
24+
interface IActivate<PsiFeatureTestZone>
2725

2826
[<ZoneActivator>]
2927
type FSharpZoneActivator() =
30-
interface IActivate<ILanguageFSharpZone> with
31-
member x.ActivatorEnabled() = true
32-
28+
interface IActivate<ILanguageFSharpZone>
3329

3430
[<ShellComponent>]
3531
type FSharpFileServiceStub() =

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@ type IFSharpTestsZone =
1414

1515
[<ZoneActivator>]
1616
type PsiFeatureTestZoneActivator() =
17-
interface IActivate<PsiFeatureTestZone> with
18-
member x.ActivatorEnabled() = true
17+
interface IActivate<PsiFeatureTestZone>
1918

2019
[<ZoneActivator>]
2120
type FSharpZoneActivator() =
22-
interface IActivate<ILanguageFSharpZone> with
23-
member x.ActivatorEnabled() = true
21+
interface IActivate<ILanguageFSharpZone>
2422

2523
[<SetUpFixture>]
2624
type PsiFeaturesTestEnvironmentAssembly() =

0 commit comments

Comments
 (0)