Using explicit type name for variables assigned to a different type

Author: SteveWilkes

ReadableExpressions.UnitTests/WhenFormattingCode.cs

@@ -219,6 +219,22 @@ public void ShouldDeclareAVariableIfUsedBeforeInitialisation()
             Assert.AreEqual(EXPECTED.TrimStart(), translated);
         }
 
+        [TestMethod]
+        public void ShouldNotVarAssignAVariableOfNonImpliedType()
+        {
+            var intsVariable = Expression.Variable(typeof(IEnumerable<int>), "ints");
+            var newArray = Expression.NewArrayBounds(typeof(int), Expression.Constant(2));
+            var assignment = Expression.Assign(intsVariable, newArray);
+
+            var block = Expression.Block(new[] { intsVariable }, assignment);
+
+            var translated = block.ToReadableString();
+
+            const string EXPECTED = "IEnumerable<int> ints = new int[2];";
+
+            Assert.AreEqual(EXPECTED, translated);
+        }
+
         [TestMethod]
         public void ShouldNotVarAssignAnOuterBlockDeclaredVariable()
         {

ReadableExpressions/Translators/BlockExpressionTranslator.cs

@@ -105,9 +105,13 @@ private static bool StatementIsTerminated(string translation, Expression express
 
         private static string GetVariableTypeName(BinaryExpression assignment)
         {
-            return assignment.Right.NodeType == ExpressionType.Lambda
-                ? assignment.Right.Type.GetFriendlyName()
-                : "var";
+            if ((assignment.Left.Type != assignment.Right.Type) ||
+                (assignment.Right.NodeType == ExpressionType.Lambda))
+            {
+                return assignment.Left.Type.GetFriendlyName();
+            }
+
+            return "var";
         }
 
         private static IEnumerable<string> ProcessBlockContents(IList<string> lines, BlockExpression block)