Merge pull request #311 from mrmonday/misc-fixes

Miscellaneous fixes

Author: GrahamTheCoder

ICSharpCode.CodeConverter/CSharp/NodesVisitor.cs

@@ -1474,7 +1474,7 @@ private bool NeedsVariableForArgument(VBSyntax.SimpleArgumentSyntax node)
                 bool isUsing = symbolInfo?.DeclaringSyntaxReferences.FirstOrDefault()?.GetSyntax()?.Parent?.Parent?.IsKind(VBasic.SyntaxKind.UsingStatement) == true;
 
                 var typeInfo = _semanticModel.GetTypeInfo(node.Expression);
-                bool isTypeMismatch = !typeInfo.Type.Equals(typeInfo.ConvertedType);
+                bool isTypeMismatch = typeInfo.Type == null || !typeInfo.Type.Equals(typeInfo.ConvertedType);
 
                 return (!isIdentifier && !isMemberAccess) || isProperty || isTypeMismatch || isUsing;
             }

ICSharpCode.CodeConverter/CSharp/TypeConversionAnalyzer.cs

@@ -105,6 +105,10 @@ private TypeConversionKind AnalyzeConversion(Microsoft.CodeAnalysis.VisualBasic.
                 }
                 return TypeConversionKind.Implicit;
             }
+            else if (csConversion.IsExplicit && csConversion.IsEnumeration)
+            {
+                return TypeConversionKind.Implicit;
+            }
             else if (csConversion.IsExplicit && vbConversion.IsNumeric && vbType.TypeKind != TypeKind.Enum)
             {
                 return TypeConversionKind.Explicit;

Tests/CSharp/ExpressionTests.cs

@@ -230,6 +230,10 @@ ElseIf Bar(True = False) Then
         End If
     End Sub
 
+    Sub Foo5()
+        Bar(Nothing)
+    End Sub
+
     Sub Bar(ByRef b As Boolean)
     End Sub
 
@@ -290,6 +294,12 @@ public void Foo4()
         }
     }
 
+    public void Foo5()
+    {
+        var argb = default(bool);
+        Bar(ref argb);
+    }
+
     public void Bar(ref bool b)
     {
     }
@@ -397,6 +407,34 @@ public void Bar(int x)
 }");
         }
 
+        [Fact]
+        public void IntToEnumArg()
+        {
+            TestConversionVisualBasicToCSharpWithoutComments(@"Public Class Class1
+    Sub Foo(ByVal arg As TriState)
+    End Sub
+
+    Sub Main()
+        Foo(0)
+    End Sub
+End Class",
+@"using Microsoft.VisualBasic;
+
+public class Class1
+{
+    public void Foo(TriState arg)
+    {
+    }
+
+    public void Main()
+    {
+        Foo((TriState)0);
+    }
+}");
+        }
+
+
+
         [Fact]
         public void EnumSwitch()
         {