v4.1.3 release (#143)

* Fixing binary opeand type-is checks, re: #142

* v4.1.3 package

---------

Co-authored-by: Steve Wilkes <[email protected]>

Author: SteveWilkes

NuGet/AgileObjects.ReadableExpressions.4.1.3.nupkg

@@ -14,10 +14,10 @@
     <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.0' ">1.6.1</NetStandardImplicitPackageVersion>
     <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
 
-    <AssemblyVersion>4.1.2.0</AssemblyVersion>
-    <FileVersion>4.1.2.0</FileVersion>
-    <VersionPrefix>4.1.2</VersionPrefix>
-    <Version>4.1.2</Version>
+    <AssemblyVersion>4.1.3.0</AssemblyVersion>
+    <FileVersion>4.1.3.0</FileVersion>
+    <VersionPrefix>4.1.3</VersionPrefix>
+    <Version>4.1.3</Version>
 
     <PackageId>AgileObjects.ReadableExpressions</PackageId>
     <Title>AgileObjects.ReadableExpressions</Title>
@@ -26,10 +26,7 @@
     <PackageIcon>./Icon.png</PackageIcon>
     <PackageTags>ExpressionTrees Debugging DebuggerVisualizers Linq DLR</PackageTags>
     <PackageProjectUrl>https://github.com/AgileObjects/ReadableExpressions</PackageProjectUrl>
-    <PackageReleaseNotes>- Fixing nullable enum translation, re: #134
-- Improving ShowCapturedValues capabilities to include captured Linq calls, re: #133
-- Fixing parameterless Value Tuple translation, re: #135
-- Fixing non-equality enum comparisons, re: #136
+    <PackageReleaseNotes>- Fixing binary operand type-is checks, re: #142
     </PackageReleaseNotes>
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <PackageOutputPath>../../NuGet</PackageOutputPath>

NuGet/AgileObjects.ReadableExpressions.4.1.3.snupkg

@@ -194,7 +194,7 @@ private static bool IsEnumType(
         Expression expression,
         out Expression enumExpression)
     {
-        if (expression.NodeType.IsCast())
+        if (expression.NodeType.IsConversion())
         {
             expression = expression.GetUnaryOperand();
         }

src/ReadableExpressions/ReadableExpressions.csproj

@@ -129,11 +129,20 @@ public static bool IsCast(ExpressionType nodeType)
     {
         return nodeType switch
         {
-            ExpressionType.Convert => true,
-            ConvertChecked => true,
             TypeAs => true,
             TypeIs => true,
             Unbox => true,
+            _ when IsConversion(nodeType) => true,
+            _ => false
+        };
+    }
+
+    public static bool IsConversion(ExpressionType nodeType)
+    {
+        return nodeType switch
+        {
+            ExpressionType.Convert => true,
+            ConvertChecked => true,
             _ => false
         };
     }

src/ReadableExpressions/Translations/BinaryTranslation.cs

@@ -49,6 +49,9 @@ public static bool IsCast(this INodeTranslation translation)
     public static bool IsCast(this ExpressionType nodeType)
         => CastTranslation.IsCast(nodeType);
 
+    public static bool IsConversion(this ExpressionType nodeType)
+        => CastTranslation.IsConversion(nodeType);
+
     public static INodeTranslation WithParentheses(
         this INodeTranslation translation)
     {

src/ReadableExpressions/Translations/CastTranslation.cs

@@ -94,6 +94,28 @@ public void ShouldTranslateAnAsCastExpression()
         translated.ShouldBe("stream as IDisposable");
     }
 
+    [Fact]
+    public void ShouldTranslateAnIsTypeExpression()
+    {
+        var objectIsDisposable = CreateLambda((object o) => o is IDisposable);
+
+        var translated = objectIsDisposable.Body.ToReadableString();
+
+        translated.ShouldBe("o is IDisposable");
+    }
+
+    // See https://github.com/agileobjects/ReadableExpressions/issues/142
+    [Fact]
+    public void ShouldTranslateAnIsTypeExpressionOperand()
+    {
+        var intValueAndIsTypeChecks =
+            CreateLambda((int i, object o) => i == 1 && o is string);
+
+        var translated = intValueAndIsTypeChecks.Body.ToReadableString();
+
+        translated.ShouldBe("(i == 1) && (o is string)");
+    }
+
     [Fact]
     public void ShouldTranslateABoxingExpression()
     {
@@ -168,7 +190,7 @@ public void ShouldTranslateExplicitUnaryConversionWithCustomStaticMethod()
                 typeof(bool),
                 typeof(Convert).GetMethod("IsDBNull")));
 
-        var translated = 
+        var translated =
             objectToBoolWithIsDbNullLambda.ToReadableString();
 
         translated.ShouldBe("() => Convert.IsDBNull(null)");