Merge pull request #377 from thinkbeforecoding/fix/makegenerictype

Author: cartermp

src/ProvidedTypes.fs

@@ -8339,7 +8339,20 @@ namespace ProviderImplementation.ProvidedTypes
             | :? TargetTypeDefinition -> failwithf "unexpected target model in ProvidedTypeBuilder.MakeGenericType, stacktrace = %s " Environment.StackTrace
             | :? ProvidedTypeDefinition as ptd when ptd.BelongsToTargetModel -> failwithf "unexpected target model ptd in MakeGenericType, stacktrace = %s " Environment.StackTrace
             | :? ProvidedTypeDefinition -> ProvidedTypeSymbol(ProvidedTypeSymbolKind.Generic genericTypeDefinition, genericArguments, ProvidedTypeBuilder.typeBuilder) :> Type
-            | _ -> TypeSymbol(TypeSymbolKind.OtherGeneric genericTypeDefinition, List.toArray genericArguments, ProvidedTypeBuilder.typeBuilder) :> Type
+            | _ ->
+                let hasProvidedArguments =
+                    genericArguments
+                    |> List.exists (function 
+                        | :? ProvidedTypeDefinition
+                        | :? ProvidedTypeSymbol -> true
+                        | _ -> false )
+                if hasProvidedArguments then
+                    TypeSymbol(TypeSymbolKind.OtherGeneric genericTypeDefinition, List.toArray genericArguments, ProvidedTypeBuilder.typeBuilder) :> Type
+                else
+                    // both genericTypeDefinition and genericArguments are not provided,
+                    // fallback on fx MakeGenericType
+                    genericTypeDefinition.MakeGenericType(List.toArray genericArguments)
+
 
         static member MakeGenericMethod(genericMethodDefinition, genericArguments: Type list) = 
             if genericArguments.Length = 0 then genericMethodDefinition else

tests/BasicErasedProvisionTests.fs

@@ -296,6 +296,13 @@ let ``test basic symbol type ops``() =
    t2T.GetConstructors() |> ignore
    t2T.GetMethod("get_Item1") |> ignore
 
+   // MakeGenericType should fallback to classic generic type when neither typedef and arguments are generated
+
+   let t3 = ProvidedTypeBuilder.MakeGenericType(typedefof<seq<_>>, [ typeof<bool> ])
+   Assert.NotEqual<string>("TypeSymbol", t3.GetType().Name ) 
+
+
+
 let stressTestCore() = 
     let refs = Targets.DotNetStandard20FSharpRefs()
     let config = Testing.MakeSimulatedTypeProviderConfig (resolutionFolder=__SOURCE_DIRECTORY__, runtimeAssembly="whatever.dll", runtimeAssemblyRefs=refs)