Only force identifier when referring to local symbol - fixes #601

Author: GrahamTheCoder

CHANGELOG.md

@@ -26,6 +26,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 * Correct logic for conversion "objectWithOverloadedEquals Is Nothing" [#591](https://github.com/icsharpcode/CodeConverter/issues/591)
 * Coercing enum to a string now correctly uses its numeric value [#590](https://github.com/icsharpcode/CodeConverter/issues/590)
 * Correct conversion for equality of overloaded types [#594](https://github.com/icsharpcode/CodeConverter/issues/594)
+* Correct conversion when for loop variable is a class member [#601](https://github.com/icsharpcode/CodeConverter/issues/601)
 
 ### C# -> VB
 

CodeConverter/CSharp/MethodBodyExecutableStatementVisitor.cs

@@ -604,9 +604,9 @@ public override async Task<SyntaxList<StatementSyntax>> VisitForEachBlock(VBSynt
                 var variableType = varSymbol.GetSymbolType();
                 var explicitCastWouldHaveNoEffect = variableType?.SpecialType == SpecialType.System_Object || _semanticModel.GetTypeInfo(stmt.Expression).ConvertedType.IsEnumerableOfExactType(variableType);
                 type = CommonConversions.GetTypeSyntax(varSymbol.GetSymbolType(), explicitCastWouldHaveNoEffect);
-                var v = await stmt.ControlVariable.AcceptAsync<IdentifierNameSyntax>(_expressionVisitor);
-                if (_localsToInlineInLoop.Contains(varSymbol)) {
-                    id = v.Identifier;
+                var v = await stmt.ControlVariable.AcceptAsync<ExpressionSyntax>(_expressionVisitor);
+                if (_localsToInlineInLoop.Contains(varSymbol) && v is IdentifierNameSyntax vId) {
+                    id = vId.Identifier;
                 } else {
                     id = CommonConversions.CsEscapedIdentifier(GetUniqueVariableNameInScope(node, "current" + varSymbol.Name.ToPascalCase()));
                     statements.Add(SyntaxFactory.ExpressionStatement(SyntaxFactory.AssignmentExpression(SyntaxKind.SimpleAssignmentExpression, v, SyntaxFactory.IdentifierName(id))));

Tests/CSharp/StatementTests/LoopStatementTests.cs

@@ -219,6 +219,42 @@ private void TestMethod(int[] values)
 }");
         }
 
+        [Fact]
+        public async Task ForEachStatementWithFieldVarUsedOuterDeclarationAsync()
+        {
+            await TestConversionVisualBasicToCSharpAsync(@"Class TestClass
+    Dim val As Integer
+
+    Private Sub TestMethod(ByVal values As Integer())
+        For Each val In values
+            If val = 2 Then Continue For
+            If val = 3 Then Exit For
+        Next
+
+        Console.WriteLine(val)
+    End Sub
+End Class", @"using System;
+
+internal partial class TestClass
+{
+    private int val;
+
+    private void TestMethod(int[] values)
+    {
+        foreach (var currentVal in values)
+        {
+            val = currentVal;
+            if (val == 2)
+                continue;
+            if (val == 3)
+                break;
+        }
+
+        Console.WriteLine(val);
+    }
+}");
+        }
+
         [Fact]
         public async Task ForEachStatementWithUnusedOuterDeclarationAsync()
         {
@@ -246,6 +282,36 @@ private void TestMethod(int[] values)
 }");
         }
 
+        [Fact]
+        public async Task ForEachStatementWithFieldVarUnusedOuterDeclarationAsync()
+        {
+            await TestConversionVisualBasicToCSharpAsync(@"Class TestClass
+    Dim val As Integer
+    Private Sub TestMethod(ByVal values As Integer())
+        For Each val In values
+            If val = 2 Then Continue For
+            If val = 3 Then Exit For
+        Next
+    End Sub
+End Class", @"
+internal partial class TestClass
+{
+    private int val;
+
+    private void TestMethod(int[] values)
+    {
+        foreach (var currentVal in values)
+        {
+            val = currentVal;
+            if (val == 2)
+                continue;
+            if (val == 3)
+                break;
+        }
+    }
+}");
+        }
+
         [Fact]
         public async Task ForEachStatementWithUnusedNestedDeclarationAsync()
         {