wip

Author: DedSec256

ReSharper.FSharp/src/FSharp.Common/src/Checker/FcsCheckerService.fs

@@ -146,8 +146,8 @@ type FcsCheckerService(lifetime: Lifetime, logger: ILogger, onSolutionCloseNotif
             |> Seq.iter x.InvalidateFcsProject
 
     member x.InvalidateFcsProjects(solution: ISolution, isApplicable: IProject -> bool) =
-        use lock = ReadLockCookie.Create()
         if checker.IsValueCreated then
+            use lock = ReadLockCookie.Create()
             solution.GetAllProjects()
             |> Seq.filter isApplicable
             |> Seq.iter x.InvalidateFcsProject

ReSharper.FSharp/src/FSharp.Common/src/Shim/TypeProviders/ExtensionTypingProviderShim.fs

@@ -11,6 +11,7 @@ open JetBrains.ProjectModel
 open JetBrains.ProjectModel.Tasks
 open JetBrains.Rd.Tasks
 open JetBrains.ReSharper.Feature.Services.Daemon
+open JetBrains.ReSharper.Plugins.FSharp
 open JetBrains.ReSharper.Plugins.FSharp.Checker
 open JetBrains.ReSharper.Plugins.FSharp.Settings
 open JetBrains.ReSharper.Plugins.FSharp.TypeProviders.Protocol

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

@@ -105,9 +105,7 @@
     <action id="SendFsiRefs" class="com.jetbrains.rider.plugins.fsharp.services.fsi.SendProjectReferencesToFsiAction" icon="/icons/fsharpConsole.png">
       <add-to-group group-id="SolutionExplorerPopupMenu.Repl"/>
     </action>
-    <action id="Rider.Plugins.FSharp.RestartTypeProviders" class="com.jetbrains.rider.plugins.fsharp.services.typeProviders.RestartTypeProvidersAction" icon="/icons/Fsharp.svg">
-      <add-to-group group-id="ToolsMenu" anchor="after" relative-to-action="Rider.Plugins.FSharp.FsiGroup"/>
-    </action>
+    <action id="Rider.Plugins.FSharp.RestartTypeProviders" class="com.jetbrains.rider.plugins.fsharp.services.typeProviders.RestartTypeProvidersAction" icon="/icons/Fsharp.svg"/>
   </actions>
 
   <project-components>