Refactore and clean

Author: Sébastien Geiser

CodingSeb.ExpressionEvaluator.Tests/ExpressionEvaluatorTests.cs

@@ -1971,12 +1971,9 @@ public object EvaluateWithSpecificEvaluator(ExpressionEvaluator evaluator, strin
             {
                 return evaluator.Evaluate(expression);
             }
-            catch (Exception exception)
+            catch (Exception exception) when (inCaseOfException != null)
             {
-                if (inCaseOfException == null)
-                    throw;
-                else
-                    return inCaseOfException(exception);
+                return inCaseOfException(exception);
             }
         }
 

CodingSeb.ExpressionEvaluator/ExpressionEvaluator.cs

@@ -454,7 +454,7 @@ public static void ClearAllCaches()
 
         private static IList<Assembly> staticAssemblies;
         private IList<Assembly> assemblies;
-        
+
         /// <summary>
         /// All assemblies needed to resolves Types
         /// by default all Assemblies loaded in the current AppDomain
@@ -3154,7 +3154,7 @@ protected virtual Type GetTypeByFriendlyName(string typeName, string genericType
 
                 if (result == null)
                 {
-                    result = Types.ToList().Find(type => type.Name.Equals(typeName, StringComparisonForCasing));
+                    result = Types.ToList().Find(type => type.Name.Equals(typeName, StringComparisonForCasing) || type.FullName.StartsWith(typeName + ","));
                 }
 
                 for (int a = 0; a < Assemblies.Count && result == null; a++)