Merge pull request #1120 from TymurGubayev/fix/RefConstArgument/1

Always use `RefConversion.PreAssigment` for `const`s
icsharpcode · Jul 22, 2024 · cf2d4aa · cf2d4aa
2 parents fc0a1e6 + 19b0a5c
commit cf2d4aa
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/CodeConverter/CSharp/ExpressionNodeVisitor.cs b/CodeConverter/CSharp/ExpressionNodeVisitor.cs
@@ -1836,6 +1836,9 @@ RefConversion GetRefConversion(VBSyntax.ExpressionSyntax expression)
             if (symbolInfo is IPropertySymbol propertySymbol) {
                 return propertySymbol.IsReadOnly ? RefConversion.PreAssigment : RefConversion.PreAndPostAssignment;
             }
+            else if (symbolInfo is IFieldSymbol { IsConst: true } or ILocalSymbol { IsConst: true }) {
+                return RefConversion.PreAssigment;
+            }
 
             if (DeclaredInUsing(symbolInfo)) return RefConversion.PreAssigment;
 

diff --git a/Tests/CSharp/MemberTests/MemberTests.cs b/Tests/CSharp/MemberTests/MemberTests.cs
@@ -4047,6 +4047,40 @@ public static int StaticTestProperty
             return _StaticTestProperty_sPrevPosition + 1;
         }
     }
+}");
+    }
+
+    [Fact]
+    public async Task TestRefConstArgumentAsync()
+    {
+        await TestConversionVisualBasicToCSharpAsync(
+            @"Class RefConstArgument
+    Const a As String = ""a""
+    Sub S()
+        Const b As String = ""b""
+        MO(a)
+        MS(b)
+    End Sub
+    Sub MO(ByRef s As Object) : End Sub
+    Sub MS(ByRef s As String) : End Sub
+End Class", @"
+internal partial class RefConstArgument
+{
+    private const string a = ""a"";
+    public void S()
+    {
+        const string b = ""b"";
+        object args = a;
+        MO(ref args);
+        string args1 = b;
+        MS(ref args1);
+    }
+    public void MO(ref object s)
+    {
+    }
+    public void MS(ref string s)
+    {
+    }
 }");
     }
 }