refactoring

Author: DedSec256

ReSharper.FSharp/src/FSharp/FSharp.Common/FSharp.Common.fsproj

@@ -69,7 +69,7 @@
     <Compile Include="src\Shim\FileSystem\AssemblyInfoShim.fs" />
     <Compile Include="src\Shim\AssemblyReader\AssemblyReaderShim.fs" />
     <Compile Include="src\Shim\TypeProviders\TypeProvidersClient.fs" />
-    <Compile Include="src\Shim\TypeProviders\ExtensionTypingProviderShim.fs" />
+    <Compile Include="src\Shim\TypeProviders\TypeProvidersShim.fs" />
     <Compile Include="src\Shim\TypeProviders\ZoneMarker.fs" />
     <Compile Include="src\Checker\ScriptFcsProjectProvider.fs" />
     <Compile Include="src\Checker\FcsProjectBuilder.fs" />

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

@@ -6,6 +6,7 @@ open System.Collections.Generic
 open FSharp.Compiler.TypeProviders
 open FSharp.Compiler.Text
 open FSharp.Core.CompilerServices
+open JetBrains.Core
 open JetBrains.Diagnostics
 open JetBrains.Lifetimes
 open JetBrains.ProjectModel
@@ -86,9 +87,10 @@ type ITypeProvidersClient =
         compilerToolsPath: string list *
         m: range -> ITypeProvider list
 
+    abstract member Scope: TypeProvidersHostingScope
     abstract member Context: TypeProvidersContext
     abstract member IsActive: bool
-    abstract member Execute: (TypeProvidersConnection -> 'a) -> 'a
+    abstract member RuntimeVersion: string
     abstract member Terminate: unit -> unit
     abstract member Dump: unit -> string
 
@@ -121,6 +123,7 @@ type internal TypeProvidersClientBase(lifetimeDef: LifetimeDefinition, connectio
     member this.Lifetime = lifetime
     member this.DisposeTypeProviders(path: string) = disposeTypeProviders path
     abstract member CreateTypeProviders: RdTypeProvider[] * TypeProvidersContext * ResolutionEnvironment -> IProxyTypeProvider list
+    abstract member Scope: TypeProvidersHostingScope
 
     interface ITypeProvidersClient with
         member x.GetOrCreate(runTimeAssemblyFileName: string, designTimeAssemblyNameString: string,
@@ -152,13 +155,27 @@ type internal TypeProvidersClientBase(lifetimeDef: LifetimeDefinition, connectio
 
             typeProviderProxies
 
+        member this.Scope = this.Scope
         member this.Context = tpContext
         member this.IsActive = connection.IsActive
-        member this.Execute(action) = connection.Execute(fun _ -> action(connection))
         member this.Terminate() = lifetimeDef.Terminate()
 
         member this.Dump() =
-            $"{typeProviders.Dump()}\n\n{tpContext.Dump()}"
+            let this = this :> ITypeProvidersClient
+            let scope = this.Scope
+
+            if not this.IsActive then $"{scope}: Out-of-process disabled" else
+
+            let inProcessDump =
+                $"[{scope} - In-Process dump]:\n\n" + $"{typeProviders.Dump()}\n\n{tpContext.Dump()}"
+
+            let outOfProcessDump =
+                $"[{scope} - Out-Process dump]:\n\n{connection.ProtocolModel.RdTestHost.Dump.Sync(Unit.Instance)}"
+
+            $"{inProcessDump}\n\n{outOfProcessDump}"
+
+        member this.RuntimeVersion =
+            connection.ProtocolModel.RdTestHost.RuntimeVersion.Sync(Unit.Instance)
 
 
 type internal SolutionTypeProvidersClient(lifetimeDef: LifetimeDefinition,
@@ -188,6 +205,8 @@ type internal SolutionTypeProvidersClient(lifetimeDef: LifetimeDefinition,
             use lock = lock.Push()
             projectsWithGenerativeProviders.Add(project.GetPersistentID()) |> ignore
 
+    override this.Scope = TypeProvidersHostingScope.Solution
+
     override this.CreateTypeProviders(tps, context, resolutionEnv) =
         let psiModule =
             resolutionEnv.OutputFile
@@ -216,5 +235,7 @@ type internal ScriptTypeProvidersClient(lifetimeDef: LifetimeDefinition, connect
         scriptPsiModulesProvider.ModuleInvalidated.Advise(this.Lifetime, fun psiModule ->
             this.DisposeTypeProviders(psiModule.Path.FullPath))
 
+    override this.Scope = TypeProvidersHostingScope.Scripts
+
     override this.CreateTypeProviders(tps, context, _) =
         [ for tp in tps -> new ProxyTypeProvider(tp, context, null) ]

ReSharper.FSharp/src/FSharp/FSharp.Common/src/Shim/TypeProviders/ExtensionTypingProviderShim.fs renamed to ReSharper.FSharp/src/FSharp/FSharp.Common/src/Shim/TypeProviders/TypeProvidersShim.fs

@@ -10,7 +10,6 @@ open JetBrains
 open JetBrains.Application.Environment
 open JetBrains.Application.Environment.Helpers
 open JetBrains.Application.Parts
-open JetBrains.Core
 open JetBrains.Diagnostics
 open JetBrains.Lifetimes
 open JetBrains.ProjectModel
@@ -48,7 +47,7 @@ type TypeProvidersShim(solution: ISolution, toolset: ISolutionToolset,
 
     let getSolutionTypeProvidersClient () =
         let client = clients.GetValueSafe(TypeProvidersHostingScope.Solution)
-        if isNull client then null.As<ITypeProvidersClient>() else client.Value
+        if isNull client then Unchecked.defaultof<_> else client.Value
 
     let terminateConnections () =
         for client in clients.Values do
@@ -144,36 +143,22 @@ type TypeProvidersShim(solution: ISolution, toolset: ISolutionToolset,
 
         member this.RuntimeVersion() =
             let client = getSolutionTypeProvidersClient()
-            if isNull client || not client.IsActive then null else
-
-            client.Execute(_.ProtocolModel.RdTestHost.RuntimeVersion.Sync(Unit.Instance))
+            if isNull client then null else client.RuntimeVersion
 
         member this.DumpTypeProvidersProcess() =
             clients
-            |> Seq.map (fun (KeyValue(scope, client)) ->
-                let client = client.Value
-
-                if not client.IsActive then $"{scope}: Out-of-process disabled" else
-
-                let inProcessDump =
-                    $"[{scope} - In-Process dump]:\n\n{client.Dump()}"
-
-                let outOfProcessDump =
-                    $"[{scope} - Out-Process dump]:\n\n{client.Execute( _.ProtocolModel.RdTestHost.Dump.Sync(Unit.Instance))}"
-
-                $"{inProcessDump}\n\n{outOfProcessDump}"
-            )
+            |> Seq.map (fun (KeyValue(_, client)) -> client.Value.Dump())
             |> String.concat "\n\n-----------------------------------------------------\n\n"
 
+        member this.SolutionTypeProvidersClient = getSolutionTypeProvidersClient ()
+
         member this.HasGenerativeTypeProviders(project) =
-            let client = getSolutionTypeProvidersClient()
+            let client = getSolutionTypeProvidersClient ()
             // We can determine which projects contain generative provided types
             // only from type providers hosted out-of-process
             isNotNull client &&
             client.IsActive &&
             client.As<SolutionTypeProvidersClient>().HasGenerativeTypeProviders(project)
 
-        member this.SolutionTypeProvidersClient = getSolutionTypeProvidersClient ()
-
     interface IDisposable with
         member this.Dispose() = terminateConnections ()

ReSharper.FSharp/src/FSharp/FSharp.TypeProviders.Protocol/src/Models/ProxyTypeProvider.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Linq;
 using System.Reflection;
+using JetBrains.Annotations;
 using JetBrains.Rd.Tasks;
 using JetBrains.ReSharper.Plugins.FSharp.TypeProviders.Protocol.Cache;
 using JetBrains.ReSharper.Plugins.FSharp.TypeProviders.Protocol.Exceptions;
@@ -27,7 +28,7 @@ public class ProxyTypeProvider : IProxyTypeProvider
     public RdCustomAttributeData[] Attributes => EmptyArray<RdCustomAttributeData>.Instance;
 
     public ProxyTypeProvider(RdTypeProvider rdTypeProvider, TypeProvidersContext typeProvidersContext,
-      IPsiModule module)
+      [CanBeNull] IPsiModule module)
     {
       PsiModule = module;
       myRdTypeProvider = rdTypeProvider;