Merge pull request #135 from CoderNate/master

Closes #134 - Handle WithEvents fields without initializers

Author: GrahamTheCoder

ICSharpCode.CodeConverter/CSharp/NodesVisitor.cs

@@ -363,7 +363,9 @@ public override CSharpSyntaxNode VisitFieldDeclaration(VBSyntax.FieldDeclaration
                 foreach (var declarator in node.Declarators) {
                     foreach (var decl in CommonConversions.SplitVariableDeclarations(declarator).Values) {
                         if (isWithEvents) {
-                            var initializers = decl.Variables.ToDictionary(v => v.Identifier.Text, v => v.Initializer);
+                            var initializers = decl.Variables
+                                .Where(a => a.Initializer != null)
+                                .ToDictionary(v => v.Identifier.Text, v => v.Initializer);
                             var fieldDecl = decl.RemoveNodes(initializers.Values, SyntaxRemoveOptions.KeepNoTrivia);
                             var initializerCollection = convertedModifiers.Any(m => m.IsKind(SyntaxKind.StaticKeyword))
                                 ? _additionalInitializers.AdditionalStaticInitializers

Tests/CSharp/MemberTests.cs

@@ -435,6 +435,61 @@ public static void PrintTestMessage3()
 }");
         }
 
+        [Fact]
+        public void TestWitheventsWithoutInitializer()
+        {
+            TestConversionVisualBasicToCSharpWithoutComments(
+@"Class MyEventClass
+    Public Event TestEvent()
+End Class
+Class Class1
+    WithEvents MyEventClassInstance As MyEventClass
+    Sub EventClassInstance_TestEvent() Handles MyEventClassInstance.TestEvent
+    End Sub
+End Class", @"using System.Runtime.CompilerServices;
+
+class MyEventClass
+{
+    public event TestEventEventHandler TestEvent;
+
+    public delegate void TestEventEventHandler();
+}
+
+class Class1
+{
+    private MyEventClass _MyEventClassInstance;
+
+    private MyEventClass MyEventClassInstance
+    {
+        [MethodImpl(MethodImplOptions.Synchronized)]
+        get
+        {
+            return _MyEventClassInstance;
+        }
+
+        [MethodImpl(MethodImplOptions.Synchronized)]
+        set
+        {
+            if (_MyEventClassInstance != null)
+            {
+                _MyEventClassInstance.TestEvent -= EventClassInstance_TestEvent;
+            }
+
+            _MyEventClassInstance = value;
+            if (_MyEventClassInstance != null)
+            {
+                _MyEventClassInstance.TestEvent += EventClassInstance_TestEvent;
+            }
+        }
+    }
+
+    public void EventClassInstance_TestEvent()
+    {
+    }
+}
+");
+        }
+
         [Fact]
         public void TestClassHandlesWithEvents()
         {