From d4c4d0a425a62a4987c222c4b77b249ec1c88d14 Mon Sep 17 00:00:00 2001 From: de4dot Date: Tue, 22 Nov 2011 09:49:59 +0100 Subject: [PATCH] Don't add override prefix if scope has 2+ methods --- de4dot.code/renamer/Renamer.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/de4dot.code/renamer/Renamer.cs b/de4dot.code/renamer/Renamer.cs index 0346ab26..689b27da 100644 --- a/de4dot.code/renamer/Renamer.cs +++ b/de4dot.code/renamer/Renamer.cs @@ -724,7 +724,9 @@ namespace de4dot.renamer { } static readonly Regex removeGenericsArityRegex = new Regex(@"`[0-9]+"); - static string getOverridePrefix(MethodDef method) { + static string getOverridePrefix(MethodNameScope scope, MethodDef method) { + if (scope.Methods.Count != 1) + return ""; if (method.MethodDefinition.Overrides.Count == 0) return ""; var overrideMethod = method.MethodDefinition.Overrides[0]; @@ -766,7 +768,7 @@ namespace de4dot.renamer { else methodPrefix = null; - overridePrefix = getOverridePrefix(eventMethod); + overridePrefix = getOverridePrefix(scope, eventMethod); if (renameOverrides && overridePrefix == "") return null; if (!renameOverrides && overridePrefix != "") @@ -848,7 +850,7 @@ namespace de4dot.renamer { if (propMethod == null) throw new ApplicationException("No properties found"); - overridePrefix = getOverridePrefix(propMethod); + overridePrefix = getOverridePrefix(scope, propMethod); if (renameOverrides && overridePrefix == "") return null; @@ -984,7 +986,7 @@ namespace de4dot.renamer { } var overrideMethod = scope.Methods[0]; - var overridePrefix = getOverridePrefix(overrideMethod); + var overridePrefix = getOverridePrefix(scope, overrideMethod); if (renameOverrides && overridePrefix == "") return; if (!renameOverrides && overridePrefix != "")