Implicilty typed inherited events no longer create extra delegates - fixes #700

Author: GrahamTheCoder

CHANGELOG.md

@@ -9,7 +9,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 
 ### VB -> C#
-
+* All handlers from multi-line handles syntax now converted [#701](https://github.com/icsharpcode/CodeConverter/issues/701)
+* Implicilty typed inherited events no longer create extra delegates [#700](https://github.com/icsharpcode/CodeConverter/issues/700)
 
 ### C# -> VB
 

CodeConverter/CSharp/DeclarationNodeVisitor.cs

@@ -1228,7 +1228,8 @@ public override async Task<CSharpSyntaxNode> VisitEventStatement(VBSyntax.EventS
             var modifiers = CommonConversions.ConvertModifiers(node, node.Modifiers, GetMemberContext(node));
             var id = CommonConversions.ConvertIdentifier(node.Identifier);
 
-            if (node.AsClause == null) {
+            var symbol = _semanticModel.GetDeclaredSymbol(node);
+            if (node.AsClause == null && symbol.BaseMember() == null) {
                 var delegateName = SyntaxFactory.Identifier(id.ValueText + "EventHandler");
 
                 var delegateDecl = SyntaxFactory.DelegateDeclaration(
@@ -1251,12 +1252,13 @@ await node.ParameterList.AcceptAsync<ParameterListSyntax>(_triviaConvertingExpre
                 _additionalDeclarations.Add(node, new MemberDeclarationSyntax[] { delegateDecl });
                 return eventDecl;
             }
-
+            var type = symbol.Type != null || node.AsClause == null ? CommonConversions.GetTypeSyntax(symbol.Type) : await node.AsClause.Type.AcceptAsync<TypeSyntax>(_triviaConvertingExpressionVisitor);
+            var declaration = SyntaxFactory.VariableDeclaration(type,
+                                SyntaxFactory.SingletonSeparatedList(SyntaxFactory.VariableDeclarator(id)));
             return SyntaxFactory.EventFieldDeclaration(
                 SyntaxFactory.List(attributes),
                 modifiers,
-                SyntaxFactory.VariableDeclaration(await node.AsClause.Type.AcceptAsync<TypeSyntax>(_triviaConvertingExpressionVisitor),
-                    SyntaxFactory.SingletonSeparatedList(SyntaxFactory.VariableDeclarator(id)))
+                declaration
             );
         }
 

Tests/CSharp/MemberTests/EventMemberTests.cs

@@ -62,6 +62,64 @@ public void RaisingFlour()
 }");
         }
 
+        [Fact]
+        public async Task TestEventsOnInterfaceAsync()
+        {
+            await TestConversionVisualBasicToCSharpAsync(
+@"Public Interface IFileSystem
+
+    Event FileChanged(FileData As String)
+    Event FileCreated(FileData As String)
+    Event FileDeleted(FileData As String)
+    Event FileRenamed(e As RenamedEventArgs)
+    Event WatcherError(e As ErrorEventArgs)
+
+End Interface
+
+Public Class FileSystemWin
+    Implements IFileSystem
+
+    Public Event FileChanged(FileData As String) Implements IFileSystem.FileChanged
+    Public Event FileCreated(FileData As String) Implements IFileSystem.FileCreated
+    Public Event FileDeleted(FileData As String) Implements IFileSystem.FileDeleted
+    Public Event FileRenamed(e As RenamedEventArgs) Implements IFileSystem.FileRenamed
+    Public Event WatcherError(e As ErrorEventArgs) Implements IFileSystem.WatcherError
+
+End Class", @"using System.IO;
+
+public partial interface IFileSystem
+{
+    event FileChangedEventHandler FileChanged;
+
+    delegate void FileChangedEventHandler(string FileData);
+
+    event FileCreatedEventHandler FileCreated;
+
+    delegate void FileCreatedEventHandler(string FileData);
+
+    event FileDeletedEventHandler FileDeleted;
+
+    delegate void FileDeletedEventHandler(string FileData);
+
+    event FileRenamedEventHandler FileRenamed;
+
+    delegate void FileRenamedEventHandler(RenamedEventArgs e);
+
+    event WatcherErrorEventHandler WatcherError;
+
+    delegate void WatcherErrorEventHandler(ErrorEventArgs e);
+}
+
+public partial class FileSystemWin : IFileSystem
+{
+    public event IFileSystem.FileChangedEventHandler FileChanged;
+    public event IFileSystem.FileCreatedEventHandler FileCreated;
+    public event IFileSystem.FileDeletedEventHandler FileDeleted;
+    public event IFileSystem.FileRenamedEventHandler FileRenamed;
+    public event IFileSystem.WatcherErrorEventHandler WatcherError;
+}");
+        }
+
         [Fact]
         public async Task TestModuleHandlesWithEventsAsync()
         {