VisualizerData rewrite -- handle types generally, fixes for test fail…

…ures
zspitz · May 8, 2019 · 7ab6767 · 7ab6767
1 parent 688c7c7
commit 7ab6767
Show file tree

Hide file tree

Showing 8 changed files with 267 additions and 146 deletions.
diff --git a/Shared/ExpressionExtension.cs b/Shared/ExpressionExtension.cs
@@ -32,11 +32,5 @@ public static class ExpressionExtension {
 
         public static string ToString(this CatchBlock catchBlock, string formatter, out Dictionary<object, List<(int start, int length)>> visitedParts) =>
             CodeWriter.Create(formatter, catchBlock, out visitedParts).ToString();
-
-        public static string ToString(this LabelTarget labelTarget, string formatter) =>
-            CodeWriter.Create(formatter, labelTarget).ToString();
-
-        public static string ToString(this LabelTarget labelTarget, string formatter, out Dictionary<object, List<(int start, int length)>> visitedParts) =>
-            CodeWriter.Create(formatter, labelTarget, out visitedParts).ToString();
     }
 }
diff --git a/Shared/Util/Extensions/Expression.cs b/Shared/Util/Extensions/Expression.cs
@@ -4,10 +4,10 @@
 namespace ExpressionToString.Util {
     public static class ExpressionExtensions {
         public static object ExtractValue(this Expression expr) {
-            if (!(expr is LambdaExpression lexpr)) {
-                lexpr = Lambda(expr);
+            if (!(expr is LambdaExpression lambda)) {
+                lambda = Lambda(expr);
             }
-            return lexpr.Compile().DynamicInvoke();
+            return lambda.Compile().DynamicInvoke();
         }
 
         public static bool TryExtractValue(this Expression expr, out object value) {
@@ -26,5 +26,8 @@ public static class ExpressionExtensions {
 
         public static bool IsEmpty(this Expression expr) =>
             expr is DefaultExpression && expr.Type == typeof(void);
+
+        public static bool IsClosedVariable(this Expression expr) =>
+            expr is MemberExpression mexpr && (mexpr.Expression?.Type.IsClosureClass() ?? false);
     }
 }
diff --git a/Shared/Util/Extensions/IEnumerable.cs b/Shared/Util/Extensions/IEnumerable.cs
@@ -13,11 +13,5 @@ public static class IEnumerableExtensions {
             return false;
         }
         public static bool None(this IEnumerable src) => !src.Any();
-        public static object First(this IEnumerable src) {
-            foreach (var item in src) {
-                return item;
-            }
-            return null;
-        }
     }
 }
diff --git a/Shared/Util/Extensions/Type.cs b/Shared/Util/Extensions/Type.cs
@@ -30,7 +30,7 @@ public static class TypeExtensions {
         public static bool InheritsFromOrImplements<T>(this Type type) => typeof(T).IsAssignableFrom(type);
 
         public static bool IsClosureClass(this Type type) =>
-            type.HasAttribute<CompilerGeneratedAttribute>() && type.Name.ContainsAny("DisplayClass", "Closure$");
+            type != null && type.HasAttribute<CompilerGeneratedAttribute>() && type.Name.ContainsAny("DisplayClass", "Closure$");
 
         public static bool IsAnonymous(this Type type) =>
             type.HasAttribute<CompilerGeneratedAttribute>() && type.Name.Contains("Anonymous") && type.Name.ContainsAny("<>", "VB$");
@@ -170,5 +170,34 @@ public static class TypeExtensions {
             if (memberName == null) { return new PropertyInfo[] { }; }
             return type.GetProperties().Where(x => x.Name == memberName).ToArray();
         }
+
+        // https://stackoverflow.com/a/55244482
+        /// <summary>Returns T for T[] and types that implement IEnumerable&lt;T&gt;</summary>
+        public static Type ItemType(this Type type) {
+            if (type.IsArray) {
+                return type.GetElementType();
+            }
+
+            // type is IEnumerable<T>;
+            if (ImplIEnumT(type)) {
+                return type.GetGenericArguments().First();
+            }
+
+            // type implements/extends IEnumerable<T>;
+            var enumType = type.GetInterfaces().Where(ImplIEnumT).Select(t => t.GetGenericArguments().First()).FirstOrDefault();
+            if (enumType != null) {
+                return enumType;
+            }
+
+            // type is IEnumerable
+            if (IsIEnum(type) || type.GetInterfaces().Any(IsIEnum)) {
+                return typeof(object);
+            }
+
+            return null;
+
+            bool IsIEnum(Type t) => t == typeof(System.Collections.IEnumerable);
+            bool ImplIEnumT(Type t) => t.IsGenericType && t.GetGenericTypeDefinition() == typeof(IEnumerable<>);
+        }
     }
 }
diff --git a/Shared/Util/Functions.cs b/Shared/Util/Functions.cs
@@ -63,7 +63,7 @@ public static class Functions {
         /// <summary>Returns a string representation of the value, which may or may not be a valid literal in the language</summary>
         public static string StringValue(object o, string language) {
             var (isLiteral, repr) = TryRenderLiteral(o, language);
-            if (!isLiteral && o.GetType().GetMethod("ToString").DeclaringType != typeof(object)) {
+            if (!isLiteral && o.GetType().GetMethods().Where(x => x.Name=="ToString" && x.GetParameters().None() && x.DeclaringType != typeof(object)).Any()) {
                 return o.ToString();
             }
             return repr;

diff --git a/Tests.Common/Constructed/MakeLabel.cs b/Tests.Common/Constructed/MakeLabel.cs
@@ -67,21 +67,5 @@ End Block
     End Block
 End Block"
         );
-
-        [Fact]
-        [Trait("Category", Labels)]
-        public void ConstructLabelTarget() => RunTest(
-            Label("target"),
-            "target",
-            "target"
-        );
-
-        [Fact]
-        [Trait("Category", Labels)]
-        public void ConstructEmptyLabelTarget() => RunTest(
-            Label(""),
-            "",
-            ""
-        );
     }
 }
diff --git a/Tests.DotNetCore/Runner.cs b/Tests.DotNetCore/Runner.cs
@@ -29,10 +29,6 @@ public static class Runner {
                     testCSharpCode = catchBlock.ToString(CSharp);
                     testVBCode = catchBlock.ToString(VisualBasic);
                     break;
-                case LabelTarget labelTarget:
-                    testCSharpCode = labelTarget.ToString(CSharp);
-                    testVBCode = labelTarget.ToString(VisualBasic);
-                    break;
             }