Convert if parts in expected order

Author: GrahamTheCoder

CodeConverter/CSharp/MethodBodyExecutableStatementVisitor.cs

@@ -424,17 +424,23 @@ public override async Task<SyntaxList<StatementSyntax>> VisitMultiLineIfBlock(VB
             var elseClause = await ConvertElseClause(node.ElseBlock);
             elseClause = elseClause.WithVbSourceMappingFrom(node.ElseBlock); //Special case where explicit mapping is needed since block becomes clause so cannot be easily visited
 
-            foreach (var elseIf in node.ElseIfBlocks.Reverse()) {
-                var elseBlock = SyntaxFactory.Block(await ConvertStatements(elseIf.Statements));
-                var elseIfCondition = (ExpressionSyntax) await elseIf.ElseIfStatement.Condition.AcceptAsync(_expressionVisitor);
-                elseIfCondition = CommonConversions.TypeConversionAnalyzer.AddExplicitConversion(elseIf.ElseIfStatement.Condition, elseIfCondition, forceTargetType: _vbBooleanTypeSymbol);
-                var ifStmt = SyntaxFactory.IfStatement(elseIfCondition, elseBlock, elseClause);
+            var elseIfBlocks = await node.ElseIfBlocks.SelectAsync(async elseIf => await ConvertElseIf(elseIf));
+            foreach (var elseIf in elseIfBlocks.Reverse()) {
+                var ifStmt = SyntaxFactory.IfStatement(elseIf.ElseIfCondition, elseIf.ElseBlock, elseClause);
                 elseClause = SyntaxFactory.ElseClause(ifStmt);
             }
 
             return SingleStatement(SyntaxFactory.IfStatement(condition, block, elseClause));
         }
 
+        private async Task<(ExpressionSyntax ElseIfCondition, BlockSyntax ElseBlock)> ConvertElseIf(VBSyntax.ElseIfBlockSyntax elseIf)
+        {
+            var elseBlock = SyntaxFactory.Block(await ConvertStatements(elseIf.Statements));
+            var elseIfCondition = (ExpressionSyntax)await elseIf.ElseIfStatement.Condition.AcceptAsync(_expressionVisitor);
+            elseIfCondition = CommonConversions.TypeConversionAnalyzer.AddExplicitConversion(elseIf.ElseIfStatement.Condition, elseIfCondition, forceTargetType: _vbBooleanTypeSymbol);
+            return (elseIfCondition, elseBlock);
+        }
+
         private async Task<ElseClauseSyntax> ConvertElseClause(VBSyntax.ElseBlockSyntax elseBlock)
         {
             if (elseBlock == null) return null;

Tests/CSharp/ExpressionTests/ByRefTests.cs

@@ -398,19 +398,19 @@ public void UsesRef(bool someBool, int someInt)
         int argvrbTst3 = Prop;
         bool c = TakesRef(ref argvrbTst3);
         Prop = argvrbTst3; // Requires variable before, and to assign back after
-        bool localTakesRef() { int argvrbTst = Prop; var ret = TakesRef(ref argvrbTst); Prop = argvrbTst; return ret; }
+        bool localTakesRef() { int argvrbTst = 3; var ret = TakesRef(ref argvrbTst); return ret; }
 
-        bool localTakesRef1() { int argvrbTst = 3; var ret = TakesRef(ref argvrbTst); return ret; }
+        bool localTakesRef1() { int argvrbTst = Prop; var ret = TakesRef(ref argvrbTst); Prop = argvrbTst; return ret; }
 
         if (16 > someInt || TakesRef(ref someInt)) // Convert directly
         {
             Console.WriteLine(1);
         }
-        else if (someBool && localTakesRef1()) // Requires variable before (in local function)
+        else if (someBool && localTakesRef()) // Requires variable before (in local function)
         {
             someInt += 1;
         }
-        else if (localTakesRef()) // Requires variable before, and to assign back after (in local function)
+        else if (localTakesRef1()) // Requires variable before, and to assign back after (in local function)
         {
             someInt -= 2;
         }