Always convert Call statement to method call - fixes #445

Author: GrahamTheCoder

CHANGELOG.md

@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 * Omit conversion in string concatenation where possible [#508](https://github.com/icsharpcode/CodeConverter/issues/508)
 * Use ToString for numeric types rather than Conversions.ToString
 * Convert optional ref parameters - fixes #91
+* Always convert Call statement to method call [#445](https://github.com/icsharpcode/CodeConverter/issues/445)
 
 ### C# -> VB
 

CodeConverter/CSharp/ExpressionNodeVisitor.cs

@@ -1232,7 +1232,7 @@ private async Task<IEnumerable<ArgumentSyntax>> ConvertArguments(VBasic.Syntax.A
             ISymbol invocationSymbol = GetInvocationSymbol(node.Parent);
             int vbPositionalArgs = node.Arguments.TakeWhile(a => !a.IsNamed).Count();
             var namedArgNames = new HashSet<string>(node.Arguments.OfType<VBasic.Syntax.SimpleArgumentSyntax>().Where(a => a.IsNamed).Select(a => a.NameColonEquals.Name.Identifier.Text), StringComparer.OrdinalIgnoreCase);
-            bool afterOmitted = false;
+            bool forceNamedParameters = false;
             var argumentSyntaxs = (await node.Arguments.SelectAsync(async (a, i) => await ConvertArg(a, i)))
                 .Where(a => a != null);
 
@@ -1247,9 +1247,8 @@ private async Task<IEnumerable<ArgumentSyntax>> ConvertArguments(VBasic.Syntax.A
             async Task<ArgumentSyntax> ConvertArg(VBSyntax.ArgumentSyntax a, int i)
             {
                 if (a.IsOmitted) {
-                    afterOmitted = true;
-
                     if (invocationSymbol != null) {
+                        forceNamedParameters = true;
                         return null; //Prefer to skip omitted and use named parameters when the symbol is available
                     }
 
@@ -1259,7 +1258,7 @@ async Task<ArgumentSyntax> ConvertArg(VBSyntax.ArgumentSyntax a, int i)
 
                 var argumentSyntax = (ArgumentSyntax)await a.AcceptAsync(TriviaConvertingExpressionVisitor);
 
-                if (afterOmitted) {
+                if (forceNamedParameters) {
                     var elementAtOrDefault = invocationSymbol.GetParameters().ElementAt(i).Name;
                     return argumentSyntax.WithNameColon(SyntaxFactory.NameColon(elementAtOrDefault));
                 }
@@ -1339,7 +1338,7 @@ private static bool IsArrayElementAccess(IOperation operation)
         /// </summary>
         private static bool ProbablyNotAMethodCall(VBasic.Syntax.InvocationExpressionSyntax node, ISymbol symbol, ITypeSymbol symbolReturnType)
         {
-            return !(symbol is IMethodSymbol) && symbolReturnType.IsErrorType() && node.Expression is VBasic.Syntax.IdentifierNameSyntax && node.ArgumentList?.Arguments.Any() == true;
+            return !node.IsParentKind(VBasic.SyntaxKind.CallStatement) && !(symbol is IMethodSymbol) && symbolReturnType.IsErrorType() && node.Expression is VBasic.Syntax.IdentifierNameSyntax && node.ArgumentList?.Arguments.Any() == true;
         }
 
         private async Task<ArgumentListSyntax> ConvertArgumentListOrEmpty(VBasic.Syntax.ArgumentListSyntax argumentListSyntax)

Tests/CSharp/MissingSemanticModelInfo/ExpressionTests.cs

@@ -340,5 +340,15 @@ public void Test()
 CS0246: The type or namespace name 'SomeUnknownType' could not be found (are you missing a using directive or an assembly reference?)");
         }
 
+        [Fact]
+        public async Task CallShouldAlwaysBecomeInvocation()
+        {
+            await TestConversionVisualBasicToCSharp(
+                @"Call mySuperFunction(strSomething, , optionalSomething)",
+                @"mySuperFunction(strSomething, default, optionalSomething);",
+                expectSurroundingBlock: true, missingSemanticInfo: true
+            );
+        }
+
     }
 }