Fix generic type arity inference. Add more tests.

Author: dmiller

Clojure/Clojure/Lib/ClrTypeSpec2.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Text.RegularExpressions;
 
 namespace clojure.lang.TypeName2;
 
@@ -816,6 +817,19 @@ public Type Resolve(
         else
             type = asm.GetType(_name.DisplayName, false, ignoreCase);
 
+        if (type is null)
+        {
+            var arityName = MaybeAddBackquoteArity(_name);
+            if (!arityName.Equals(_name.DisplayName))
+            {
+                if (typeResolver is not null)
+                    type = typeResolver(asm, arityName, ignoreCase);
+                else
+                    type = asm.GetType(arityName, false, ignoreCase);
+            }
+        }
+
+
         if (type is null)
         {
             if (throwOnError)
@@ -827,7 +841,8 @@ public Type Resolve(
         {
             foreach (var n in _nested)
             {
-                var tmp = type.GetNestedType(n.DisplayName, BindingFlags.Public | BindingFlags.NonPublic);
+                var nestedName = MaybeAddBackquoteArity(n);
+                var tmp = type.GetNestedType(nestedName, BindingFlags.Public | BindingFlags.NonPublic);
                 if (tmp is null)
                 {
                     if (throwOnError)
@@ -888,6 +903,16 @@ private static Type DefaultTypeResolver(Assembly assembly, string typename, Name
         return type;
     }
 
+    Regex _backquoteArityRegex = new(@"^.*`\d*$", RegexOptions.Compiled);
+
+    private string MaybeAddBackquoteArity(IClrTypeIdentifier name)
+    {
+        if (name.ImplicitGenericCount > 0 && !_backquoteArityRegex.IsMatch(name.DisplayName))
+            return $"{name.DisplayName}`{name.ImplicitGenericCount}";
+        else
+            return name.DisplayName;
+    }
+
     #endregion
 
 
@@ -906,17 +931,6 @@ public static Type GetTypeFromName(string name, Namespace ns = null)
     }
 
 
-    //        public static Type GetTypeFromName(string name, Namespace ns = null)
-    //        {
-    //            ClrTypeSpec2 spec = Parse(name);
-    //            if (spec == null)
-    //                return null;
-    //            return spec.Resolve(
-    //                ns,
-    //                name,
-    //                assyName => Assembly.Load(assyName));
-    //        }
-
     #endregion
 
 }