Set refkind for raise event invocations - fixes #584

Author: GrahamTheCoder

CHANGELOG.md

@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 * Handle Option Compare Text case insensitive comparisons in switch statements [#579](https://github.com/icsharpcode/CodeConverter/issues/579)
 * Fix compilation error when switching with enum cases [#549](https://github.com/icsharpcode/CodeConverter/issues/549)
 * Improve numeric casts [#580](https://github.com/icsharpcode/CodeConverter/issues/580)
+* Add ref to conversion of RaiseEvent where needed [#584](https://github.com/icsharpcode/CodeConverter/issues/584)
 
 ### C# -> VB
 

CodeConverter/CSharp/CommonConversions.cs

@@ -633,6 +633,7 @@ public ISymbol GetDeclaredCsOriginalSymbolOrNull(VBasic.VisualBasicSyntaxNode no
 
         public ISymbol GetCsOriginalSymbolOrNull(ISymbol symbol)
         {
+            if (symbol == null) return null;
             symbol = symbol.OriginalDefinition;
             // Construct throws an exception if ConstructedFrom differs from it, so let's use ConstructedFrom directly
             var symbolToFind = symbol is IMethodSymbol m ? m.ConstructedFrom : symbol;

CodeConverter/CSharp/ExpressionNodeVisitor.cs

@@ -409,9 +409,9 @@ public override async Task<CSharpSyntaxNode> VisitSimpleArgument(VBasic.Syntax.S
             SyntaxToken token = default(SyntaxToken);
             var convertedArgExpression = ((ExpressionSyntax)await node.Expression.AcceptAsync(TriviaConvertingExpressionVisitor)).SkipParens();
             var typeConversionAnalyzer = CommonConversions.TypeConversionAnalyzer;
-            if (symbol is IMethodSymbol methodSymbol) {
-                var parameters = (CommonConversions.GetCsOriginalSymbolOrNull(methodSymbol.OriginalDefinition) ?? methodSymbol).GetParameters();
-                var refType = GetRefConversionType(node, argList, parameters, out var argName, out var refKind);
+            var possibleParameters = (CommonConversions.GetCsOriginalSymbolOrNull(symbol?.OriginalDefinition) ?? symbol)?.GetParameters();
+            if (possibleParameters.HasValue) {
+                var refType = GetRefConversionType(node, argList, possibleParameters.Value, out var argName, out var refKind);
                 token = GetRefToken(refKind);
                 if (refType != RefConversion.Inline) {
                     convertedArgExpression = HoistByRefDeclaration(node, convertedArgExpression, refType, argName, refKind);

Tests/CSharp/MemberTests/EventMemberTests.cs

@@ -570,5 +570,34 @@ public void POW_btnV2DBM_Click()
 1 target compilation errors:
 CS0246: The type or namespace name 'Button' could not be found (are you missing a using directive or an assembly reference?)");
         }
+
+        [Fact]
+        public async Task Issue584_EventWithByRefAsync()
+        {
+            await TestConversionVisualBasicToCSharpAsync(@"Public Class Issue584RaiseEventByRefDemo
+    Public Event ConversionNeeded(ai_OrigID As Integer, ByRef NewID As Integer)
+
+    Public Function TestConversion(ai_ID) As Integer
+        Dim i_NewValue As Integer
+        RaiseEvent ConversionNeeded(ai_ID, i_NewValue)
+        Return i_NewValue
+    End Function
+End Class", @"using Microsoft.VisualBasic.CompilerServices; // Install-Package Microsoft.VisualBasic
+
+public partial class Issue584RaiseEventByRefDemo
+{
+    public event ConversionNeededEventHandler ConversionNeeded;
+
+    public delegate void ConversionNeededEventHandler(int ai_OrigID, ref int NewID);
+
+    public int TestConversion(object ai_ID)
+    {
+        var i_NewValue = default(int);
+        ConversionNeeded?.Invoke(Conversions.ToInteger(ai_ID), ref i_NewValue);
+        return i_NewValue;
+    }
+}
+");
+        }
     }
 }