Implement TupleInitializationStatement - fixes #225

Author: GrahamTheCoder

ICSharpCode.CodeConverter/CSharp/NodesVisitor.cs

@@ -1153,13 +1153,13 @@ private IEnumerable<ArgumentSyntax> ConvertArguments(VBSyntax.ArgumentListSyntax
 
             public override CSharpSyntaxNode VisitSimpleArgument(VBSyntax.SimpleArgumentSyntax node)
             {
-                int argId = ((VBSyntax.ArgumentListSyntax)node.Parent).Arguments.IndexOf(node);
                 var invocation = node.Parent.Parent;
                 if (invocation is VBSyntax.ArrayCreationExpressionSyntax)
                     return node.Expression.Accept(TriviaConvertingVisitor);
                 var symbol = GetInvocationSymbol(invocation);
                 SyntaxToken token = default(SyntaxToken);
                 if (symbol != null) {
+                    int argId = ((VBSyntax.ArgumentListSyntax)node.Parent).Arguments.IndexOf(node);
                     var parameterKinds = symbol.GetParameters().Select(param => param.RefKind).ToList();
                     //WARNING: If named parameters can reach here it won't work properly for them
                     var refKind = argId >= parameterKinds.Count ? RefKind.None : parameterKinds[argId];
@@ -1500,6 +1500,31 @@ private static CSharpSyntaxNode CreateLambdaExpression(ParameterListSyntax param
 
             #region Type Name / Modifier
 
+            public override CSharpSyntaxNode VisitTupleType(VBSyntax.TupleTypeSyntax node)
+            {
+                var elements = node.Elements.Select(e => (TupleElementSyntax)e.Accept(TriviaConvertingVisitor));
+                return SyntaxFactory.TupleType(SyntaxFactory.SeparatedList(elements));
+            }
+
+            public override CSharpSyntaxNode VisitTypedTupleElement(VBSyntax.TypedTupleElementSyntax node)
+            {
+                return SyntaxFactory.TupleElement((TypeSyntax) node.Type.Accept(TriviaConvertingVisitor));
+            }
+
+            public override CSharpSyntaxNode VisitNamedTupleElement(VBSyntax.NamedTupleElementSyntax node)
+            {
+                return SyntaxFactory.TupleElement((TypeSyntax)node.AsClause.Type.Accept(TriviaConvertingVisitor), CommonConversions.ConvertIdentifier(node.Identifier));
+            }
+
+            public override CSharpSyntaxNode VisitTupleExpression(VBSyntax.TupleExpressionSyntax node)
+            {
+                var args = node.Arguments.Select(a => {
+                    var expr = (ExpressionSyntax)a.Expression.Accept(TriviaConvertingVisitor);
+                    return SyntaxFactory.Argument(expr);
+                });
+                return SyntaxFactory.TupleExpression(SyntaxFactory.SeparatedList(args));
+            }
+
             public override CSharpSyntaxNode VisitPredefinedType(VBSyntax.PredefinedTypeSyntax node)
             {
                 if (SyntaxTokenExtensions.IsKind(node.Keyword, VBasic.SyntaxKind.DateKeyword)) {

Tests/CSharp/ExpressionTests.cs

@@ -985,7 +985,7 @@ public void StringInterpolationWithConditionalOperator()
         }
 
         [Fact]
-        public void LogicalOrWithConditionalOperator()
+        public void Tuple()
         {
             TestConversionVisualBasicToCSharpWithoutComments(
                 @"Public Function GetString(yourBoolean as Boolean) As Boolean

Tests/CSharp/StatementTests.cs

@@ -107,6 +107,22 @@ private void TestMethod()
 }");
         }
 
+        [Fact]
+        public void TupleInitializationStatement()
+        {
+            TestConversionVisualBasicToCSharp(@"Class TestClass
+    Private Sub TestMethod()
+        Dim totales As (fics As Integer, dirs As Integer) = (0, 0)
+    End Sub
+End Class", @"class TestClass
+{
+    private void TestMethod()
+    {
+        (int fics, int dirs) totales = (0, 0);
+    }
+}");
+        }
+
         [Fact]
         public void ObjectInitializationStatementInDeclaration()
         {