From 2672696e3ab6c3fe2f097af8348854a68ba4ca75 Mon Sep 17 00:00:00 2001 From: Cj <161484149+CJ-SPT@users.noreply.github.com> Date: Sat, 11 Jan 2025 06:18:08 -0500 Subject: [PATCH] remove redundant method --- RecodeItLib/Remapper/Renamer.cs | 34 ++++++--------------------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/RecodeItLib/Remapper/Renamer.cs b/RecodeItLib/Remapper/Renamer.cs index a377066..5a6f5e0 100644 --- a/RecodeItLib/Remapper/Renamer.cs +++ b/RecodeItLib/Remapper/Renamer.cs @@ -25,12 +25,13 @@ internal class Renamer types); RenameAllProperties( - remap!.TypePrimeCandidate!.Name.String, + remap.TypePrimeCandidate!.Name.String, remap.NewTypeName, types); FixMethods(types, remap); - RenameType(types, remap); + + remap.TypePrimeCandidate.Name = remap.NewTypeName; } private static void FixMethods( @@ -69,7 +70,8 @@ internal class Renamer string newTypeName, IEnumerable typesToCheck) { - foreach (var type in typesToCheck) + var typeDefs = typesToCheck as TypeDef[] ?? typesToCheck.ToArray(); + foreach (var type in typeDefs) { var fields = type.Fields .Where(field => field.Name.IsFieldOrPropNameInList(TokensToMatch!)); @@ -90,7 +92,7 @@ internal class Renamer field.Name = newFieldName; - UpdateAllTypeFieldMemberRefs(typesToCheck, field, oldName); + UpdateAllTypeFieldMemberRefs(typeDefs, field, oldName); fieldCount++; } @@ -169,28 +171,4 @@ internal class Renamer { return propertyCount > 0 ? $"{newName}_{propertyCount}" : newName; } - - private static void RenameType(IEnumerable 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; - } - } - } } \ No newline at end of file