0
0
mirror of https://github.com/sp-tarkov/assembly-tool.git synced 2025-02-13 02:10:45 -05:00

remove redundant method

This commit is contained in:
Cj 2025-01-11 06:18:08 -05:00
parent efea0532c5
commit 2672696e3a

View File

@ -25,12 +25,13 @@ internal class Renamer
types); types);
RenameAllProperties( RenameAllProperties(
remap!.TypePrimeCandidate!.Name.String, remap.TypePrimeCandidate!.Name.String,
remap.NewTypeName, remap.NewTypeName,
types); types);
FixMethods(types, remap); FixMethods(types, remap);
RenameType(types, remap);
remap.TypePrimeCandidate.Name = remap.NewTypeName;
} }
private static void FixMethods( private static void FixMethods(
@ -69,7 +70,8 @@ internal class Renamer
string newTypeName, string newTypeName,
IEnumerable<TypeDef> typesToCheck) IEnumerable<TypeDef> typesToCheck)
{ {
foreach (var type in typesToCheck) var typeDefs = typesToCheck as TypeDef[] ?? typesToCheck.ToArray();
foreach (var type in typeDefs)
{ {
var fields = type.Fields var fields = type.Fields
.Where(field => field.Name.IsFieldOrPropNameInList(TokensToMatch!)); .Where(field => field.Name.IsFieldOrPropNameInList(TokensToMatch!));
@ -90,7 +92,7 @@ internal class Renamer
field.Name = newFieldName; field.Name = newFieldName;
UpdateAllTypeFieldMemberRefs(typesToCheck, field, oldName); UpdateAllTypeFieldMemberRefs(typeDefs, field, oldName);
fieldCount++; fieldCount++;
} }
@ -169,28 +171,4 @@ internal class Renamer
{ {
return propertyCount > 0 ? $"{newName}_{propertyCount}" : newName; return propertyCount > 0 ? $"{newName}_{propertyCount}" : newName;
} }
private static void RenameType(IEnumerable<TypeDef> typesToCheck, RemapModel remap)
{
foreach (var type in typesToCheck)
{
if (type.HasNestedTypes)
{
RenameType(type.NestedTypes, remap!);
}
if (remap?.TypePrimeCandidate?.Name is null) { continue; }
if (remap.SearchParams.NestedTypes.IsNested is true &&
type.IsNested && type.Name == remap.TypePrimeCandidate.Name)
{
type.Name = remap.NewTypeName;
}
if (type.FullName == remap.TypePrimeCandidate.Name)
{
type.Name = remap.NewTypeName;
}
}
}
} }