use AnAction

Author: DedSec256

ReSharper.FSharp/test/src/FSharp.Tests.Host/FSharpTestHost.fs

@@ -54,7 +54,7 @@ type FSharpTestHost(lifetime: Lifetime, solution: ISolution, checkerService: Fcs
         solution.GetComponent<IProxyExtensionTypingProvider>().DumpTypeProvidersProcess()
 
     do
-        let fsTestHost = solution.RdFSharpModel().FSharpTestHost
+        let fsTestHost = solution.RdFSharpModel().FsharpTestHost
 
         // We want to get events published by background checker.
         checkerService.Checker.ImplicitlyStartBackgroundWork <- true

rider-fsharp/protocol/src/kotlin/model/RdFSharpModel.kt

@@ -64,7 +64,7 @@ object RdFSharpModel : Ext(SolutionModel.Solution) {
         setting(CSharp50Generator.Namespace, "JetBrains.ReSharper.Plugins.FSharp")
 
         field("fSharpInteractiveHost", RdFSharpInteractiveHost)
-        field("fSharpTestHost", RdFSharpTestHost)
+        field("fsharpTestHost", RdFSharpTestHost)
         field("fSharpTypeProvidersHost", RdFSharpTypeProvidersHost)
         property("fcsBusyDelayMs", int)
     }

rider-fsharp/src/main/java/com/jetbrains/rider/plugins/fsharp/services/typeProviders/TypeProvidersActions.kt

@@ -1,18 +1,23 @@
 package com.jetbrains.rider.plugins.fsharp.services.typeProviders
 
-import com.intellij.openapi.project.Project
+import com.intellij.openapi.actionSystem.AnAction
+import com.intellij.openapi.actionSystem.AnActionEvent
 import com.jetbrains.rd.platform.util.lifetime
 import com.jetbrains.rider.plugins.fsharp.rdFSharpModel
-import com.jetbrains.rider.projectView.actions.ProjectViewActionBase
 import com.jetbrains.rider.projectView.solution
-import com.jetbrains.rider.projectView.workspace.ProjectModelEntity
-import com.jetbrains.rider.projectView.workspace.isSolution
 
-class RestartTypeProvidersAction : ProjectViewActionBase("Restart Type Providers", "Restart Type Providers") {
-    override fun actionPerformedInternal(entity: ProjectModelEntity, project: Project) {
-        project.solution.rdFSharpModel.fSharpTypeProvidersHost.restartTypeProviders.start(project.lifetime, Unit)
+class RestartTypeProvidersAction : AnAction("Restart Type Providers") {
+    override fun update(e: AnActionEvent) {
+        val project = e.project
+        if (project != null) {
+            e.presentation.isEnabledAndVisible = project.solution.rdFSharpModel.fSharpTypeProvidersHost.isLaunched.sync(Unit)
+        }
     }
 
-    override fun getItemInternal(entity: ProjectModelEntity, project: Project) =
-            if (entity.isSolution() && project.solution.rdFSharpModel.fSharpTypeProvidersHost.isLaunched.sync(Unit)) entity else null
+    override fun actionPerformed(e: AnActionEvent) {
+        val project = e.project
+        if (project != null) {
+            project.solution.rdFSharpModel.fSharpTypeProvidersHost.restartTypeProviders.start(project.lifetime, Unit)
+        }
+    }
 }

rider-fsharp/src/main/resources/META-INF/plugin.xml

@@ -106,7 +106,7 @@
       <add-to-group group-id="SolutionExplorerPopupMenu.Repl"/>
     </action>
     <action id="RestartTypeProvidersAction" class="com.jetbrains.rider.plugins.fsharp.services.typeProviders.RestartTypeProvidersAction" icon="/icons/Fsharp.svg">
-      <add-to-group group-id="SolutionExplorerPopupMenu.Repl"/>
+      <add-to-group group-id="ToolsMenu" anchor="after" relative-to-action="Rider.Plugins.FSharp.FsiGroup"/>
     </action>
   </actions>