Fix #1956: Adapt previous fix for variable names that have a number as suffix.

siegfriedpammer · siegfriedpammer · commit 8a67f48e4e8d · 2025-03-21T08:34:44.000+01:00
diff --git a/ICSharpCode.Decompiler/IL/Transforms/AssignVariableNames.cs b/ICSharpCode.Decompiler/IL/Transforms/AssignVariableNames.cs
@@ -215,7 +215,8 @@ static bool IsSetOrEventAccessor(IMethod method)
 							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))

Original file line number	Diff line number	Diff line change
`@@ -215,7 +215,8 @@ static bool IsSetOrEventAccessor(IMethod method)`
`215`	`215`	`if (variables.TryGetValue(i, out var v))`
`216`	`216`	`variableMapping[v] = p.Name;`
`217`	`217`	`}`
`218`		`- if (!parentScope.IsReservedVariableName(p.Name, out _))`
	`218`	`+ string nameWithoutNumber = SplitName(p.Name, out int newIndex);`
	`219`	`+ if (!parentScope.IsReservedVariableName(nameWithoutNumber, out _))`
`219`	`220`	`{`
`220`	`221`	`AddExistingName(reservedVariableNames, p.Name);`
`221`	`222`	`if (variables.TryGetValue(i, out var v))`