Check for null argument list earlier - fixes #171

Author: GrahamTheCoder

ICSharpCode.CodeConverter/CSharp/NodesVisitor.cs

@@ -723,7 +723,7 @@ public override CSharpSyntaxNode VisitConstructorBlock(VBSyntax.ConstructorBlock
 
                 var ctor = (node.Statements.FirstOrDefault() as VBSyntax.ExpressionStatementSyntax)?.Expression as VBSyntax.InvocationExpressionSyntax;
                 var ctorExpression = ctor?.Expression as VBSyntax.MemberAccessExpressionSyntax;
-                var ctorArgs = (ArgumentListSyntax)ctor?.ArgumentList.Accept(TriviaConvertingVisitor);
+                var ctorArgs = (ArgumentListSyntax)ctor?.ArgumentList?.Accept(TriviaConvertingVisitor) ?? SyntaxFactory.ArgumentList();
 
                 IEnumerable<VBSyntax.StatementSyntax> statements;
                 ConstructorInitializerSyntax ctorCall;
@@ -732,10 +732,10 @@ public override CSharpSyntaxNode VisitConstructorBlock(VBSyntax.ConstructorBlock
                     ctorCall = null;
                 } else if (ctorExpression.Expression is VBSyntax.MyBaseExpressionSyntax) {
                     statements = node.Statements.Skip(1);
-                    ctorCall = SyntaxFactory.ConstructorInitializer(SyntaxKind.BaseConstructorInitializer, ctorArgs ?? SyntaxFactory.ArgumentList());
+                    ctorCall = SyntaxFactory.ConstructorInitializer(SyntaxKind.BaseConstructorInitializer, ctorArgs);
                 } else if (ctorExpression.Expression is VBSyntax.MeExpressionSyntax || ctorExpression.Expression is VBSyntax.MyClassExpressionSyntax) {
                     statements = node.Statements.Skip(1);
-                    ctorCall = SyntaxFactory.ConstructorInitializer(SyntaxKind.ThisConstructorInitializer, ctorArgs ?? SyntaxFactory.ArgumentList());
+                    ctorCall = SyntaxFactory.ConstructorInitializer(SyntaxKind.ThisConstructorInitializer, ctorArgs);
                 } else {
                     statements = node.Statements;
                     ctorCall = null;

Tests/CSharp/NamespaceLevelTests.cs

@@ -275,6 +275,25 @@ Inherits System.IO.InvalidDataException
 }");
         }
 
+        [Fact]
+        public void ClassInheritsClassWithNoParenthesesOnBaseCall()
+        {
+            // Moving where the base call appears confuses the auto comment tester
+            TestConversionVisualBasicToCSharpWithoutComments(@"Public Class DataSet1
+    Inherits Global.System.Data.DataSet
+    Public Sub New()
+        MyBase.New
+    End Sub
+End Class",
+                @"public class DataSet1 : global::System.Data.DataSet
+{
+    public DataSet1() : base()
+    {
+    }
+}
+");
+        }
+
         [Fact]
         public void MultilineDocComment()
         {