Skip to content

Commit eb6872d

Browse files
Timur KelmanTimur Kelman
authored andcommitted
don't discard result of GetUniqueVariableNameInScope
1 parent 3d32858 commit eb6872d

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

CodeConverter/CSharp/MethodBodyExecutableStatementVisitor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -786,15 +786,15 @@ public override async Task<SyntaxList<StatementSyntax>> VisitSelectBlock(VBSynta
786786
labels.Add(SyntaxFactory.DefaultSwitchLabel());
787787
} else if (c is VBSyntax.RelationalCaseClauseSyntax relational) {
788788

789-
var varName = CommonConversions.CsEscapedIdentifier(GetUniqueVariableNameInScope(node, "case"));
790-
ExpressionSyntax csLeft = ValidSyntaxFactory.IdentifierName(varName);
791789
var operatorKind = VBasic.VisualBasicExtensions.Kind(relational);
792790
var csRelationalValue = await relational.Value.AcceptAsync<ExpressionSyntax>(_expressionVisitor);
793791
CasePatternSwitchLabelSyntax caseSwitchLabelSyntax;
794792
if (isObjectComparison) {
795793
caseSwitchLabelSyntax = WrapInCasePatternSwitchLabelSyntax(node, relational.Value, csRelationalValue, false, operatorKind);
796794
}
797795
else {
796+
var varName = CommonConversions.CsEscapedIdentifier(GetUniqueVariableNameInScope(node, "case"));
797+
ExpressionSyntax csLeft = ValidSyntaxFactory.IdentifierName(varName);
798798
csRelationalValue = CommonConversions.TypeConversionAnalyzer.AddExplicitConversion(relational.Value, csRelationalValue);
799799
var binaryExp = SyntaxFactory.BinaryExpression(operatorKind.ConvertToken(), csLeft, csRelationalValue);
800800
caseSwitchLabelSyntax = VarWhen(varName, binaryExp);

Tests/CSharp/ExpressionTests/ExpressionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2344,7 +2344,7 @@ public void S()
23442344
j = 3;
23452345
break;
23462346
}
2347-
case var case4 when Operators.ConditionalCompareObjectGreater(case4, 4, false):
2347+
case var case3 when Operators.ConditionalCompareObjectGreater(case3, 4, false):
23482348
{
23492349
j = 4;
23502350
break;

0 commit comments

Comments
 (0)