From 8a67f48e4e8d7320ea5b71e5c52f2b154a57ae14 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sun, 2 Mar 2025 22:18:24 +0100 Subject: [PATCH] Fix #1956: Adapt previous fix for variable names that have a number as suffix. --- ICSharpCode.Decompiler/IL/Transforms/AssignVariableNames.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ICSharpCode.Decompiler/IL/Transforms/AssignVariableNames.cs b/ICSharpCode.Decompiler/IL/Transforms/AssignVariableNames.cs index 24f7079fc..e0029d00e 100644 --- a/ICSharpCode.Decompiler/IL/Transforms/AssignVariableNames.cs +++ b/ICSharpCode.Decompiler/IL/Transforms/AssignVariableNames.cs @@ -215,7 +215,8 @@ namespace ICSharpCode.Decompiler.IL.Transforms if (variables.TryGetValue(i, out var v)) variableMapping[v] = p.Name; } - if (!parentScope.IsReservedVariableName(p.Name, out _)) + string nameWithoutNumber = SplitName(p.Name, out int newIndex); + if (!parentScope.IsReservedVariableName(nameWithoutNumber, out _)) { AddExistingName(reservedVariableNames, p.Name); if (variables.TryGetValue(i, out var v))