Handling empty blocks, re: issue #78 / Merging refactoring from source code generation branch

Author: SteveWilkes

ReadableExpressions.UnitTests.Net35/ReadableExpressions.UnitTests.Net35.csproj

@@ -35,6 +35,10 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Remove="..\ReadableExpressions.UnitTests\ShouldExtensions.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Reference Include="System" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />

ReadableExpressions.UnitTests.NetCore3.1/ReadableExpressions.UnitTests.NetCore3.1.csproj

@@ -31,6 +31,10 @@
     </Compile>
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Remove="..\ReadableExpressions.UnitTests\ShouldExtensions.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="AgileObjects.NetStandardPolyfills" Version="1.4.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />

ReadableExpressions.UnitTests/ShouldExtensions.cs renamed to ReadableExpressions.UnitTests/FluentAssertionExtensions.cs

@@ -7,7 +7,7 @@
     using NetStandardPolyfills;
     using ReadableExpressions.Extensions;
 
-    public static class ShouldExtensions
+    public static class FluentAssertionExtensions
     {
         public static void ShouldBeDefault<T>(this T value) => value.ShouldBe(default(T));
 
@@ -54,7 +54,7 @@ public static void ShouldBe<TActual, TExpected>(this TActual value, TExpected ex
             }
         }
 
-        private static readonly MethodInfo _areEqualMethod = typeof(ShouldExtensions)
+        private static readonly MethodInfo _areEqualMethod = typeof(FluentAssertionExtensions)
             .GetNonPublicStaticMethod("AreEqual");
 
         private static bool AreEqual<TExpected, TActual>(TExpected expected, TActual actual)
@@ -203,11 +203,11 @@ public static void ShouldBeTrue(this bool? value)
             value.GetValueOrDefault().ShouldBeTrue();
         }
 
-        public static void ShouldBeTrue(this bool boolValue)
+        public static void ShouldBeTrue(this bool boolValue, string errorMessage = null)
         {
             if (boolValue != true)
             {
-                Asplode("true", "false");
+                Asplode("true", "false", errorMessage);
             }
         }
 

ReadableExpressions.UnitTests/WhenTranslatingBlocks.cs

@@ -600,6 +600,15 @@ public void ShouldIncludeAReturnKeywordForANewArrayInitStatement()
             translated.ShouldBe(EXPECTED.TrimStart());
         }
 
+        // See https://github.com/agileobjects/ReadableExpressions/issues/78
+        [Fact]
+        public void ShouldHandleAnEmptyBlock()
+        {
+            var emptyBlock = Block(Default(typeof(void)));
+
+            var translated = ToReadableString(emptyBlock);
+        }
+
         #region Helper Classes
 
         private class Company

ReadableExpressions.UnitTests/WhenTranslatingConstants.cs

@@ -485,7 +485,7 @@ internal class GenericTwo<T> { }
     internal class Generic<T1, T2, T3> { }
     // ReSharper restore UnusedTypeParameter
 
-    internal enum OddNumber
+    public enum OddNumber
     {
         One = 1
     }

ReadableExpressions.UnitTests/WhenTranslatingObjectCreations.cs

@@ -448,7 +448,7 @@ public void ShouldTranslateAnAnonymousTypeCreationWithACustomFactory()
             // ReSharper disable once AssignNullToNotNullAttribute
             var creation = New(constructor, Constant(10));
 
-            var translated = ToReadableString(creation, cfg => cfg.NameAnonymousTypesUsing(t => "MyMagicObject"));
+            var translated = ToReadableString(creation, s => s.NameAnonymousTypesUsing(t => "MyMagicObject"));
 
             translated.ShouldBe("new MyMagicObject { ValueInt = 10 }");
         }

ReadableExpressions.Visualizers.ObjectSource/ExpressionVisualizerObjectSource.cs

@@ -5,7 +5,6 @@
     using System.Linq.Expressions;
     using System.Reflection;
     using Core.Configuration;
-    using Extensions;
     using Formatting;
     using Translations.Formatting;
 
@@ -52,7 +51,7 @@ internal static string GetTranslationFor(object target)
             }
         }
 
-        private static string Translate(Type type) 
+        private static string Translate(Type type)
             => type.ToReadableString(ApplyDialogSettings);
 
         private static TranslationFormattingSettings ApplyDialogSettings(
@@ -63,7 +62,7 @@ private static TranslationFormattingSettings ApplyDialogSettings(
                 .IndentUsing(GetDialogSettings().Indent);
         }
 
-        private static TranslationSettings ApplyDialogSettings(TranslationSettings settings) 
+        private static TranslationSettings ApplyDialogSettings(TranslationSettings settings)
             => GetDialogSettings().Update(settings.FormatUsing(_htmlFormatter));
 
         private static VisualizerDialogSettings GetDialogSettings()

ReadableExpressions/ExpressionAnalysis.cs

@@ -67,10 +67,10 @@ public ExpressionAnalysis Finalise()
 
         public ICollection<ParameterExpression> JoinedAssignmentVariables => _joinedAssignmentVariables;
 
-        public bool IsNotJoinedAssignment(Expression expression)
+        public bool IsJoinedAssignment(Expression expression)
         {
-            return (expression.NodeType != ExpressionType.Assign) ||
-                   _joinedAssignments?.Contains((BinaryExpression)expression) != true;
+            return (expression.NodeType == ExpressionType.Assign) &&
+                   _joinedAssignments?.Contains((BinaryExpression)expression) == true;
         }
 
         public bool IsCatchBlockVariable(Expression variable)

ReadableExpressions/ExpressionExtensions.cs

@@ -46,7 +46,7 @@ public static string ToReadableString(
             }
 
             var settings = configuration.GetTranslationSettings();
-            var translation = new ExpressionTreeTranslation(expression, settings);
+            var translation = new ExpressionTranslation(expression, settings);
 
             return translation.GetTranslation();
         }

ReadableExpressions/Extensions/InternalEnumerableExtensions.cs

@@ -58,31 +58,6 @@ public static IEnumerable<TResult> Project<TItem, TResult>(this IEnumerable<TIte
             }
         }
 
-        [DebuggerStepThrough]
-        public static IList<T> Combine<T>(this ICollection<T> first, IList<T> second)
-        {
-            var secondCount = second.Count;
-            var combined = new T[first.Count + secondCount];
-            var index = 0;
-
-            foreach (var item in first)
-            {
-                combined[index] = item;
-
-                ++index;
-            }
-
-            for (var i = 0; i < secondCount;)
-            {
-                combined[index] = second[i];
-                
-                ++index;
-                ++i;
-            }
-
-            return combined;
-        }
-
         [DebuggerStepThrough]
         public static IEnumerable<T> Filter<T>(this IEnumerable<T> items, Func<T, bool> predicate)
         {
@@ -104,14 +79,16 @@ public static IEnumerable<T> Filter<T>(this IEnumerable<T> items, Func<T, bool>
         [DebuggerStepThrough]
         public static T FirstOrDefault<T>(this IList<T> items, Func<T, bool> predicate)
         {
-            for (var i = 0; i < items.Count; i++)
+            for (var i = 0; i < items.Count;)
             {
                 var item = items[i];
 
                 if (predicate.Invoke(item))
                 {
                     return item;
                 }
+
+                ++i;
             }
 
             return default(T);