Merge pull request sq#1036 from SabaSoftware/Assembly_GetType_1035

Assembly.GetType fixed
iskiselev · Feb 24, 2017 · 2751b07 · 2751b07
2 parents 855b753 + 0cfbf85
commit 2751b07
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 5 deletions.
diff --git a/JSIL.Libraries/Includes/Core/Reflection/Classes/System.Reflection.Assembly.js b/JSIL.Libraries/Includes/Core/Reflection/Classes/System.Reflection.Assembly.js
@@ -54,14 +54,14 @@
   $.Method({ Static: false, Public: true }, "GetType",
     (new JSIL.MethodSignature($jsilcore.TypeRef("System.Type"), [$.String], [])),
     function GetType(name) {
-      return JSIL.GetTypeFromAssembly(this, name, null, false);
+      return JSIL.ReflectionGetTypeInternal(this, name, false, false, true);
     }
   );
 
   $.Method({ Static: false, Public: true }, "GetType",
     (new JSIL.MethodSignature($jsilcore.TypeRef("System.Type"), [$.String, $.Boolean], [])),
     function GetType(name, throwOnError) {
-      return JSIL.GetTypeFromAssembly(this, name, null, throwOnError);
+      return JSIL.ReflectionGetTypeInternal(this, name, throwOnError, false, true);
     }
   );
 
@@ -81,7 +81,7 @@
       if (ignoreCase)
         throw new Error("ignoreCase not implemented");
 
-      return JSIL.GetTypeFromAssembly(this, name, null, throwOnError);
+      return JSIL.ReflectionGetTypeInternal(this, name, throwOnError, ignoreCase, true);
     }
   );
 

diff --git a/JSIL.Libraries/Includes/Core/Reflection/Helpers/JSIL.ReflectionGetTypeInternal.js b/JSIL.Libraries/Includes/Core/Reflection/Helpers/JSIL.ReflectionGetTypeInternal.js
@@ -1,10 +1,10 @@
-JSIL.ReflectionGetTypeInternal = function (thisAssembly, name, throwOnFail, ignoreCase) {
+JSIL.ReflectionGetTypeInternal = function (thisAssembly, name, throwOnFail, ignoreCase, onlySpecificAssembly) {
   var parsed = JSIL.ParseTypeName(name);
 
   var result = JSIL.GetTypeInternal(parsed, thisAssembly, false);
 
   // HACK: Emulate fallback to global namespace search.
-  if (!result) {
+  if (!result && !onlySpecificAssembly) {
     result = JSIL.GetTypeInternal(parsed, JSIL.GlobalNamespace, false);
   }
 

diff --git a/Tests/SimpleTestCases/GetTypeFromAssembly_Issue1035.cs b/Tests/SimpleTestCases/GetTypeFromAssembly_Issue1035.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+
+public static class Program
+{
+    public static void Main(string[] args)
+    {
+        var typeInt32 = typeof(object).Assembly.GetType("System.Int32");
+        var typeDictionary =
+            typeof (object).Assembly.GetType(
+                "System.Collections.Generic.Dictionary`2[[System.Int32, mscorlib],[System.Object, mscorlib]]");
+        Console.WriteLine(
+            "{0} {1}", typeInt32.Name, typeDictionary.Name
+            );
+
+    }
+}
diff --git a/Tests/SimpleTests.csproj b/Tests/SimpleTests.csproj
@@ -143,6 +143,7 @@
     <None Include="SimpleTestCases\BoxNumeric_Issue981.cs" />
     <None Include="SimpleTestCases\NullableUnary_Issue997.cs" />
     <None Include="SimpleTestCasesForTranslatedBcl\Issue1008_MethodReturnType.cs" />
+    <None Include="SimpleTestCases\GetTypeFromAssembly_Issue1035.cs" />
     <Compile Include="SimpleTests.cs" />
     <None Include="SimpleTestCases\BaseAutoProperties.cs" />
     <None Include="SimpleTestCases\OverloadedVirtualMethods.cs" />