added type provider designation to provided context

DedSec256 · May 3, 2020 · 11c8086 · 11c8086
1 parent 9fd0fa2
commit 11c8086
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/fsharp/ExtensionTyping.fs b/src/fsharp/ExtensionTyping.fs
@@ -800,7 +800,7 @@ module ExtensionTyping =
                                                  compilerToolPaths,
                                                  m)
 
-        Tainted<_>.CreateAll (providers |> List.map (fun p -> p, ilScopeRefOfRuntimeAssembly))
+        Tainted<_>.CreateAll (providers |> List.map (fun p -> p, ilScopeRefOfRuntimeAssembly, ExtensionTypingProvider.DisplayNameOfTypeProvider(p)))
 
     /// Get the provided invoker expression for a particular use of a method.
     let GetInvokerExpression (provider: ITypeProvider, methodBase: ProvidedMethodBase, paramExprs: ProvidedVar[]) = 

diff --git a/src/fsharp/tainted.fs b/src/fsharp/tainted.fs
@@ -69,7 +69,7 @@ type TypeProviderError
             for msg in errors do
                 f (new TypeProviderError(errNum, tpDesignation, m, [msg], typeNameContext, methodNameContext))
 
-type TaintedContext = { TypeProvider : ITypeProvider; TypeProviderAssemblyRef : ILScopeRef }
+type TaintedContext = { TypeProvider : ITypeProvider; TypeProviderAssemblyRef : ILScopeRef; TypeProviderDesignation: string }
 
 [<NoEquality>][<NoComparison>] 
 type Tainted<'T> (context : TaintedContext, value : 'T) =
@@ -81,7 +81,7 @@ type Tainted<'T> (context : TaintedContext, value : 'T) =
         | _ -> ()
 
     member this.TypeProviderDesignation = 
-        context.TypeProvider.GetType().FullName
+        context.TypeProviderDesignation
 
     member this.TypeProviderAssemblyRef = 
         context.TypeProviderAssemblyRef
@@ -141,9 +141,9 @@ type Tainted<'T> (context : TaintedContext, value : 'T) =
     /// Access the target object directly. Use with extreme caution.
     member this.AccessObjectDirectly = value
 
-    static member CreateAll(providerSpecs : (ITypeProvider * ILScopeRef) list) =
-        [for (tp,nm) in providerSpecs do
-             yield Tainted<_>({ TypeProvider=tp; TypeProviderAssemblyRef=nm },tp) ] 
+    static member CreateAll(providerSpecs : (ITypeProvider * ILScopeRef * string) list) =
+        [for (tp,nm, tpd) in providerSpecs do
+             yield Tainted<_>({ TypeProvider = tp; TypeProviderAssemblyRef = nm; TypeProviderDesignation = tpd },tp) ] 
 
     member this.OfType<'U> () =
         match box value with

diff --git a/src/fsharp/tainted.fsi b/src/fsharp/tainted.fsi
@@ -42,7 +42,7 @@ type TypeProviderError =
 type Tainted<'T> =
 
     /// Create an initial tainted value
-    static member CreateAll : (ITypeProvider * ILScopeRef) list -> Tainted<ITypeProvider> list
+    static member CreateAll : (ITypeProvider * ILScopeRef * string) list -> Tainted<ITypeProvider> list
 
     /// A type provider that produced the value
     member TypeProvider : Tainted<ITypeProvider>