Merge branch 'parentheses'

Author: GrahamTheCoder

ICSharpCode.CodeConverter/CSharp/NodesVisitor.cs

@@ -1442,16 +1442,19 @@ public override CSharpSyntaxNode VisitSingleLineLambdaExpression(VBSyntax.Single
                     body = node.Body.Accept(TriviaConvertingVisitor);
                 }
                 var param = (ParameterListSyntax)node.SubOrFunctionHeader.ParameterList.Accept(TriviaConvertingVisitor);
-                if (param.Parameters.Count == 1)
-                    return SyntaxFactory.SimpleLambdaExpression(param.Parameters[0], body);
-                return SyntaxFactory.ParenthesizedLambdaExpression(param, body);
+                return CreateLambdaExpression(param, body);
             }
 
             public override CSharpSyntaxNode VisitMultiLineLambdaExpression(VBSyntax.MultiLineLambdaExpressionSyntax node)
             {
                 var body = SyntaxFactory.Block(node.Statements.SelectMany(s => s.Accept(CreateMethodBodyVisitor())));
                 var param = (ParameterListSyntax)node.SubOrFunctionHeader.ParameterList.Accept(TriviaConvertingVisitor);
-                if (param.Parameters.Count == 1)
+                return CreateLambdaExpression(param, body);
+            }
+
+            private static CSharpSyntaxNode CreateLambdaExpression(ParameterListSyntax param, CSharpSyntaxNode body)
+            {
+                if (param.Parameters.Count == 1 && param.Parameters.Single().Type == null)
                     return SyntaxFactory.SimpleLambdaExpression(param.Parameters[0], body);
                 return SyntaxFactory.ParenthesizedLambdaExpression(param, body);
             }

Tests/CSharp/ExpressionTests.cs

@@ -550,7 +550,7 @@ class TestClass
 {
     private void TestMethod()
     {
-        Func<int, int> test = int a => a * 2;
+        Func<int, int> test = (int a) => a * 2;
         test(3);
     }
 }");